equal
deleted
inserted
replaced
302 @@ -0,0 +1,1 @@ |
302 @@ -0,0 +1,1 @@ |
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 abort: uncommitted changes in subrepository 'sub' |
308 abort: uncommitted changes in subrepository 'sub' |
308 [255] |
309 [255] |
309 % update substate when adding .hgsub w/clean updated subrepo |
310 % update substate when adding .hgsub w/clean updated subrepo |
310 A .hgsub |
311 A .hgsub |
311 A sub/a |
312 A sub/a |
316 |
317 |
317 @@ -0,0 +1,1 @@ |
318 @@ -0,0 +1,1 @@ |
318 +sub = sub |
319 +sub = sub |
319 record this change to '.hgsub'? [Ynesfdaq?] y |
320 record this change to '.hgsub'? [Ynesfdaq?] y |
320 |
321 |
|
322 warning: subrepo spec file '.hgsub' not found |
321 warning: subrepo spec file '.hgsub' not found |
323 warning: subrepo spec file '.hgsub' not found |
322 path sub |
324 path sub |
323 source sub |
325 source sub |
324 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
326 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
325 $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF |
327 $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF |