equal
deleted
inserted
replaced
100 adding a |
100 adding a |
101 % abort when adding .hgsub w/dirty subrepo |
101 % abort when adding .hgsub w/dirty subrepo |
102 A .hgsub |
102 A .hgsub |
103 A sub/a |
103 A sub/a |
104 % qnew -X path:no-effect -m0 0.diff |
104 % qnew -X path:no-effect -m0 0.diff |
105 abort: uncommitted changes in subrepository 'sub' |
105 abort: uncommitted changes in subrepository "sub" |
106 [255] |
106 [255] |
107 % update substate when adding .hgsub w/clean updated subrepo |
107 % update substate when adding .hgsub w/clean updated subrepo |
108 A .hgsub |
108 A .hgsub |
109 A sub/a |
109 A sub/a |
110 % qnew -X path:no-effect -m0 0.diff |
110 % qnew -X path:no-effect -m0 0.diff |
116 adding a |
116 adding a |
117 % abort when modifying .hgsub w/dirty subrepo |
117 % abort when modifying .hgsub w/dirty subrepo |
118 M .hgsub |
118 M .hgsub |
119 A sub2/a |
119 A sub2/a |
120 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff |
120 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff |
121 abort: uncommitted changes in subrepository 'sub2' |
121 abort: uncommitted changes in subrepository "sub2" |
122 [255] |
122 [255] |
123 % update substate when modifying .hgsub w/clean updated subrepo |
123 % update substate when modifying .hgsub w/clean updated subrepo |
124 M .hgsub |
124 M .hgsub |
125 A sub2/a |
125 A sub2/a |
126 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff |
126 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff |
161 adding a |
161 adding a |
162 % abort when adding .hgsub w/dirty subrepo |
162 % abort when adding .hgsub w/dirty subrepo |
163 A .hgsub |
163 A .hgsub |
164 A sub/a |
164 A sub/a |
165 % qrefresh |
165 % qrefresh |
166 abort: uncommitted changes in subrepository 'sub' |
166 abort: uncommitted changes in subrepository "sub" |
167 [255] |
167 [255] |
168 % update substate when adding .hgsub w/clean updated subrepo |
168 % update substate when adding .hgsub w/clean updated subrepo |
169 A .hgsub |
169 A .hgsub |
170 A sub/a |
170 A sub/a |
171 % qrefresh |
171 % qrefresh |
178 adding a |
178 adding a |
179 % abort when modifying .hgsub w/dirty subrepo |
179 % abort when modifying .hgsub w/dirty subrepo |
180 M .hgsub |
180 M .hgsub |
181 A sub2/a |
181 A sub2/a |
182 % qrefresh |
182 % qrefresh |
183 abort: uncommitted changes in subrepository 'sub2' |
183 abort: uncommitted changes in subrepository "sub2" |
184 [255] |
184 [255] |
185 % update substate when modifying .hgsub w/clean updated subrepo |
185 % update substate when modifying .hgsub w/clean updated subrepo |
186 M .hgsub |
186 M .hgsub |
187 A sub2/a |
187 A sub2/a |
188 % qrefresh |
188 % qrefresh |
303 +sub = sub |
303 +sub = sub |
304 record this change to '.hgsub'? [Ynesfdaq?] y |
304 record this change to '.hgsub'? [Ynesfdaq?] y |
305 |
305 |
306 warning: subrepo spec file '.hgsub' not found |
306 warning: subrepo spec file '.hgsub' not found |
307 warning: subrepo spec file '.hgsub' not found |
307 warning: subrepo spec file '.hgsub' not found |
308 abort: uncommitted changes in subrepository 'sub' |
308 abort: uncommitted changes in subrepository "sub" |
309 [255] |
309 [255] |
310 % update substate when adding .hgsub w/clean updated subrepo |
310 % update substate when adding .hgsub w/clean updated subrepo |
311 A .hgsub |
311 A .hgsub |
312 A sub/a |
312 A sub/a |
313 % qrecord --config ui.interactive=1 -m0 0.diff |
313 % qrecord --config ui.interactive=1 -m0 0.diff |
340 @@ -1,1 +1,2 @@ |
340 @@ -1,1 +1,2 @@ |
341 sub = sub |
341 sub = sub |
342 +sub2 = sub2 |
342 +sub2 = sub2 |
343 record this change to '.hgsub'? [Ynesfdaq?] y |
343 record this change to '.hgsub'? [Ynesfdaq?] y |
344 |
344 |
345 abort: uncommitted changes in subrepository 'sub2' |
345 abort: uncommitted changes in subrepository "sub2" |
346 [255] |
346 [255] |
347 % update substate when modifying .hgsub w/clean updated subrepo |
347 % update substate when modifying .hgsub w/clean updated subrepo |
348 M .hgsub |
348 M .hgsub |
349 A sub2/a |
349 A sub2/a |
350 % qrecord --config ui.interactive=1 -m1 1.diff |
350 % qrecord --config ui.interactive=1 -m1 1.diff |