Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-conflicts.t @ 23517:4f18e80d9c30
rebase: show more useful status information while rebasing
Show status messages while rebasing, similar to what graft do:
rebasing 12:2647734878ef "fork" (tip)
This gives more context for the user when resolving conflicts.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 09 Dec 2014 03:45:26 +0100 |
| parents | 328afbad6e57 |
| children | 8872d1bf30da |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Sun Dec 07 20:04:45 2014 +0100 +++ b/tests/test-rebase-conflicts.t Tue Dec 09 03:45:26 2014 +0100 @@ -61,6 +61,8 @@ Conflicting rebase: $ hg rebase -s 3 -d 2 + rebasing 3:3163e20567cc "L1" + rebasing 4:46f0b057b5c0 "L2" merging common warning: conflicts during merge. merging common incomplete! (edit conflicts, then use 'hg resolve --mark') @@ -70,6 +72,8 @@ Try to continue without solving the conflict: $ hg rebase --continue + already rebased 3:3163e20567cc "L1" as 3e046f2ecedb + rebasing 4:46f0b057b5c0 "L2" abort: unresolved merge conflicts (see hg help resolve) [255] @@ -79,6 +83,9 @@ $ hg resolve -m common (no more unresolved files) $ hg rebase --continue + already rebased 3:3163e20567cc "L1" as 3e046f2ecedb + rebasing 4:46f0b057b5c0 "L2" + rebasing 5:8029388f38dc "L3" (mybook) saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob) $ hg tglog @@ -212,6 +219,7 @@ $ hg rebase -s9 -d2 --debug # use debug to really check merge base used rebase onto 2 starting from e31216eec445 + rebasing 9:e31216eec445 "more changes to f1" rebasing: 9:e31216eec445 5/6 changesets (83.33%) future parents are 2 and -1 rebase status stored @@ -235,6 +243,7 @@ getting f1.txt updating: f1.txt 1/1 files (100.00%) f1.txt + rebasing 10:2f2496ddf49d "merge" (tip) rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) future parents are 11 and 7 rebase status stored