equal
deleted
inserted
replaced
293 adding a |
293 adding a |
294 % abort when adding .hgsub w/dirty subrepo |
294 % abort when adding .hgsub w/dirty subrepo |
295 A .hgsub |
295 A .hgsub |
296 A sub/a |
296 A sub/a |
297 % qrecord --config ui.interactive=1 -m0 0.diff |
297 % qrecord --config ui.interactive=1 -m0 0.diff |
298 diff --git a/.hgsub b/.hgsub |
|
299 new file mode 100644 |
|
300 examine changes to '.hgsub'? [Ynesfdaq?] y |
|
301 |
|
302 @@ -0,0 +1,1 @@ |
|
303 +sub = sub |
|
304 record this change to '.hgsub'? [Ynesfdaq?] y |
|
305 |
|
306 warning: subrepo spec file '.hgsub' not found |
|
307 warning: subrepo spec file '.hgsub' not found |
|
308 abort: uncommitted changes in subrepository "sub" |
298 abort: uncommitted changes in subrepository "sub" |
309 [255] |
299 [255] |
310 % update substate when adding .hgsub w/clean updated subrepo |
300 % update substate when adding .hgsub w/clean updated subrepo |
311 A .hgsub |
301 A .hgsub |
312 A sub/a |
302 A sub/a |
331 adding a |
321 adding a |
332 % abort when modifying .hgsub w/dirty subrepo |
322 % abort when modifying .hgsub w/dirty subrepo |
333 M .hgsub |
323 M .hgsub |
334 A sub2/a |
324 A sub2/a |
335 % qrecord --config ui.interactive=1 -m1 1.diff |
325 % qrecord --config ui.interactive=1 -m1 1.diff |
336 diff --git a/.hgsub b/.hgsub |
|
337 1 hunks, 1 lines changed |
|
338 examine changes to '.hgsub'? [Ynesfdaq?] y |
|
339 |
|
340 @@ -1,1 +1,2 @@ |
|
341 sub = sub |
|
342 +sub2 = sub2 |
|
343 record this change to '.hgsub'? [Ynesfdaq?] y |
|
344 |
|
345 abort: uncommitted changes in subrepository "sub2" |
326 abort: uncommitted changes in subrepository "sub2" |
346 [255] |
327 [255] |
347 % update substate when modifying .hgsub w/clean updated subrepo |
328 % update substate when modifying .hgsub w/clean updated subrepo |
348 M .hgsub |
329 M .hgsub |
349 A sub2/a |
330 A sub2/a |