Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-result.t
changeset 1188 0c879e986ce4
parent 1099 bac4e0bc9f6a
child 1195 af9fd422adbb 
--- a/tests/test-stabilize-result.t	Sun Dec 14 12:14:45 2014 -0800
+++ b/tests/test-stabilize-result.t	Sun Dec 14 12:19:40 2014 -0800
@@ -92,13 +92,13 @@
   +a
   +newer a
   $ hg evolve --continue
-  grafting revision 5
+  grafting 5:3655f0f50885 "newer a"
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg evolve --continue
-  grafting revision 5
+  grafting 5:3655f0f50885 "newer a"
 
 Stabilize latecomer with different parent
 =========================================
@@ -126,6 +126,7 @@
 Get a successors of 8 on it
 
   $ hg grab 8
+  rebasing 8:1cf0aacfd363 "newer a"
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
 
 Add real change to the successors
evolve