equal
deleted
inserted
replaced
372 @ 0 base |
372 @ 0 base |
373 |
373 |
374 $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip |
374 $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip |
375 rebasing 3:3a71550954f1 "b" |
375 rebasing 3:3a71550954f1 "b" |
376 rebasing 4:e80b69427d80 "c" |
376 rebasing 4:e80b69427d80 "c" |
|
377 transaction abort! |
|
378 rollback completed |
377 abort: ^C |
379 abort: ^C |
378 [255] |
380 [255] |
379 $ hg rebase --abort |
381 $ hg rebase --abort |
380 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob) |
|
381 rebase aborted |
382 rebase aborted |
382 $ hg log -G --template "{rev} {desc} {bookmarks}" |
383 $ hg log -G --template "{rev} {desc} {bookmarks}" |
383 o 6 no-a |
384 o 6 no-a |
384 | |
385 | |
385 | o 5 d |
386 | o 5 d |
396 |
397 |
397 $ hg summary |
398 $ hg summary |
398 parent: 0:df4f53cec30a |
399 parent: 0:df4f53cec30a |
399 base |
400 base |
400 branch: default |
401 branch: default |
401 commit: (clean) |
402 commit: 1 unknown (clean) |
402 update: 6 new changesets (update) |
403 update: 6 new changesets (update) |
403 phases: 7 draft |
404 phases: 7 draft |
404 |
405 |
405 $ cd .. |
406 $ cd .. |
406 On the other hand, make sure we *do* clobber changes whenever we |
407 On the other hand, make sure we *do* clobber changes whenever we |