Mercurial > hg
diff tests/test-rebase-issue-noparam-single-rev.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 | aa4a1672583e |
line wrap: on
line diff
--- a/tests/test-rebase-issue-noparam-single-rev.t Sun Dec 07 20:04:45 2014 +0100 +++ b/tests/test-rebase-issue-noparam-single-rev.t Tue Dec 09 03:45:26 2014 +0100 @@ -52,6 +52,7 @@ $ hg up -q -C 2 $ hg rebase + rebasing 2:87c180a611f2 "l1" saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob) $ hg tglog @@ -110,6 +111,8 @@ $ hg up -q -C 3 $ hg rebase + rebasing 2:87c180a611f2 "l1" + rebasing 3:1ac923b736ef "l2" saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob) $ hg tglog