--- a/tests/test-graft.t Sun Oct 16 10:38:52 2016 -0700
+++ b/tests/test-graft.t Wed Oct 12 21:33:45 2016 +0200
@@ -427,8 +427,8 @@
$ hg graft 3 --log -u foo
grafting 3:4c60f11aa304 "3"
warning: can't find ancestor for 'c' copied from 'b'!
- $ hg log --template '{rev} {parents} {desc}\n' -r tip
- 14 1:5d205f8b35b6 3
+ $ hg log --template '{rev}:{node|short} {parents} {desc}\n' -r tip
+ 14:0c921c65ef1e 1:5d205f8b35b6 3
(grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
Resolve conflicted graft
@@ -620,7 +620,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
- changeset: 14:f64defefacee
+ changeset: 14:0c921c65ef1e
parent: 1:5d205f8b35b6
user: foo
date: Thu Jan 01 00:00:00 1970 +0000