Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-check-restore.t @ 23517:4f18e80d9c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-check-restore.t	Sun Dec 07 20:04:45 2014 +0100
+++ b/tests/test-rebase-check-restore.t	Tue Dec 09 03:45:26 2014 +0100
@@ -65,6 +65,8 @@
   o  0:draft 'A'
   
   $ hg rebase -s 1 -d 4 --keep
+  rebasing 1:27547f69f254 "B"
+  rebasing 2:965c486023db "C"
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -78,6 +80,8 @@
   $ hg resolve -m A
   (no more unresolved files)
   $ hg rebase --continue
+  already rebased 1:27547f69f254 "B" as 45396c49d53b
+  rebasing 2:965c486023db "C"
 
   $ hg tglog
   o  7:secret 'C'
@@ -119,6 +123,7 @@
   o  0:draft 'A'
   
   $ hg rebase -s 5 -d 4 --keepbranches
+  rebasing 5:01e6ebbd8272 "F" (tip)
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -132,6 +137,7 @@
   $ hg resolve -m A
   (no more unresolved files)
   $ hg rebase --continue
+  rebasing 5:01e6ebbd8272 "F" (tip)
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob)
 
   $ hg tglog