--- a/tests/test-evolve.t Sun Dec 14 12:14:45 2014 -0800
+++ b/tests/test-evolve.t Sun Dec 14 12:19:40 2014 -0800
@@ -496,9 +496,9 @@
o 0:8685c6d34325@default(draft) add 0
$ hg graft -r3 -O
- grafting revision 3
+ grafting 3:0e84df4912da "add 3"
$ hg graft -r1 -o 2
- grafting revision 1
+ grafting 1:73d38bb17fd7 "add 1"
$ glog --hidden
@ 6:acb28cd497b7@default(draft) add 1
|
@@ -526,7 +526,7 @@
created new head
$ hg up -qC 6
$ hg graft -O 7
- grafting revision 7
+ grafting 7:a5bfd90a2f29 "conflict" (tip)
merging 1
warning: conflicts during merge.
merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -539,7 +539,7 @@
$ hg resolve -m 1
(no more unresolved files)
$ hg graft --continue -O
- grafting revision 7
+ grafting 7:a5bfd90a2f29 "conflict" (tip)
$ glog --hidden
@ 8:920e58bb443b@default(draft) conflict
|