diff -r 405be3783fbc -r b86eea66ed02 tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Sep 30 23:33:00 2015 +0900
+++ b/tests/test-evolve.t	Tue Sep 29 15:40:28 2015 -0400
@@ -335,7 +335,7 @@
   move:[4] another feature (child of 568a468b60fc)
   atop:[6] a nifty feature
   merging main-file-1
-  working directory is now at 5c9c8d9c2e4e
+  working directory is now at 99833d22b0c6
   $ hg log
   7	feature-B: another feature (child of ba0ec09b1bab) - test
   6	feature-A: a nifty feature - test
@@ -376,10 +376,10 @@
   recreate:[8] another feature that rox
   atop:[7] another feature (child of ba0ec09b1bab)
   computing new diff
-  committed as 476d0454d60e
-  working directory is now at 476d0454d60e
+  committed as 2d8c5414e9f0
+  working directory is now at 2d8c5414e9f0
   $ hg glog
-  @  9	feature-B: bumped update to 5c9c8d9c2e4e: - test
+  @  9	feature-B: bumped update to 99833d22b0c6: - test
   |
   o  7	: another feature (child of ba0ec09b1bab) - test
   |
@@ -436,7 +436,7 @@
   move:[11] dansk 3!
   atop:[14] dansk 2!
   merging main-file-1
-  working directory is now at cfb5ebed336d
+  working directory is now at 536984593824
   $ hg glog
   @  15	: dansk 3! - test
   |
@@ -809,11 +809,11 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
-  @  16:d6239ff09c9f@default(draft) Folding with custom commit message
+  @  16:d1297ecc971f@default(draft) Folding with custom commit message
   |
-  o  13:56ade053f46d@default(draft) dansk!
+  o  13:27b934eaf1f9@default(draft) dansk!
   |
-  o  7:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
+  o  7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   |
   o  6:ba0ec09b1bab@default(public) a nifty feature
   |
@@ -828,9 +828,9 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qlog
-  17 - dba606655966 A longer
+  17 - 0b1eca0e871b A longer
                     commit message (draft)
-  7 - 5c9c8d9c2e4e another feature (child of ba0ec09b1bab) (public)
+  7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
   6 - ba0ec09b1bab a nifty feature (public)
   0 - e55e0562ee93 base (public)
 
@@ -895,11 +895,11 @@
   $ hg evolve
   move:[5] a2
   atop:[7] a1_
-  working directory is now at 5406c5cfee42
+  working directory is now at eb07e22a0e63
   $ hg evolve
   move:[6] a3
   atop:[8] a2
-  working directory is now at c7661e655801
+  working directory is now at 777c26ca5e78
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
   @  9 [mybranch] a3
   |
@@ -948,7 +948,7 @@
   move:[8] a2
   atop:[10] a1__
   (leaving bookmark testbookmark)
-  working directory is now at f37ed7a60f43
+  working directory is now at d952e93add6f
   $ ls .hg/bookmarks*
   .hg/bookmarks
 
@@ -1014,12 +1014,12 @@
   recreate:[12] add new file bumped
   atop:[11] a2
   computing new diff
-  committed as d66b1e328488
-  working directory is now at d66b1e328488
+  committed as f15d32934071
+  working directory is now at f15d32934071
   $ hg evolve --any
   move:[9] a3
-  atop:[13] bumped update to f37ed7a60f43:
-  working directory is now at 7d2ce5f38f9b
+  atop:[13] bumped update to d952e93add6f:
+  working directory is now at cce26b684bfe
 Check that we can resolve troubles in a revset with more than one commit
   $ hg up 14 -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1038,7 +1038,7 @@
   |/
   @  14	: a3 - test
   |
-  o  13	: bumped update to f37ed7a60f43: - test
+  o  13	: bumped update to d952e93add6f: - test
   |
   o  11	: a2 - test
   |
@@ -1057,7 +1057,7 @@
   | |/
   | x  14	: a3 - test
   |/
-  o  13	: bumped update to f37ed7a60f43: - test
+  o  13	: bumped update to d952e93add6f: - test
   |
   o  11	: a2 - test
   |
@@ -1080,7 +1080,7 @@
   atop:[18] a3
   move:[16] add gh
   atop:[18] a3
-  working directory is now at db3d894869b0
+  working directory is now at e02107f98737
   $ hg glog
   @  20	: add gh - test
   |
@@ -1088,7 +1088,7 @@
   |/
   o  18	: a3 - test
   |
-  o  13	: bumped update to f37ed7a60f43: - test
+  o  13	: bumped update to d952e93add6f: - test
   |
   o  11	: a2 - test
   |
@@ -1210,26 +1210,26 @@
   $ hg amend
   2 new unstable changesets
   $ glog -r "18::"
-  @  25:4c0bc042ef3b@default(draft) add j1
+  @  25:8dc373be86d9@default(draft) add j1
   |
-  | o  23:c70048fd3350@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  22:714e60ca57b7@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  21:b430835af718@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  19:10ffdd7e3cc9@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
 
   $ hg evolve --rev 23 --any
   abort: cannot specify both "--rev" and "--any"
   [255]
   $ hg evolve --rev 23
-  cannot solve instability of c70048fd3350, skipping
+  cannot solve instability of d7eadcf6eccd, skipping
 
 Check that uncommit respects the allowunstable option
 With only createmarkers we can only uncommit on a head
@@ -1237,30 +1237,30 @@
   > [experimental]
   > evolution=createmarkers, allnewcommands
   > EOF
-  $ hg up 4c0bc042ef3b^
+  $ hg up 8dc373be86d9^
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg uncommit --all
   abort: cannot uncommit in the middle of a stack
   [255]
-  $ hg up 4c0bc042ef3b
+  $ hg up 8dc373be86d9
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg uncommit --all
   new changeset is empty
   (use "hg prune ." to remove it)
   $ glog -r "18::"
-  @  26:04b32348803e@default(draft) add j1
+  @  26:044804d0c10d@default(draft) add j1
   |
-  | o  23:c70048fd3350@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  22:714e60ca57b7@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  21:b430835af718@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  19:10ffdd7e3cc9@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
 
 Check that prune respects the allowunstable option
@@ -1277,19 +1277,19 @@
   atop:[26] add j1
   move:[23] add j3
   atop:[27] add j2
-  working directory is now at 920a35e8dbd0
+  working directory is now at c9a20e2d74aa
   $ glog -r "18::"
-  @  28:920a35e8dbd0@default(draft) add j3
+  @  28:c9a20e2d74aa@default(draft) add j3
   |
-  o  27:31e050d895dd@default(draft) add j2
+  o  27:b0e3066231e2@default(draft) add j2
   |
-  o  26:04b32348803e@default(draft) add j1
+  o  26:044804d0c10d@default(draft) add j1
   |
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  19:10ffdd7e3cc9@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   $ hg up 19
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -1304,30 +1304,30 @@
   $ hg prune '26::'
   3 changesets pruned
   $ glog -r "18::"
-  @  29:5a6c53544778@default(draft) add c5_
+  @  29:2251801b6c91@default(draft) add c5_
   |
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  19:10ffdd7e3cc9@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
 
 Check that fold respects the allowunstable option
-  $ hg up 0bb66d4c1968
+  $ hg up edc3c9de504e
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit unstableifparentisfolded
   created new head
   $ glog -r "18::"
-  @  30:30ecefd67c0a@default(draft) add unstableifparentisfolded
+  @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |
-  | o  29:5a6c53544778@default(draft) add c5_
+  | o  29:2251801b6c91@default(draft) add c5_
   | |
-  +---o  20:db3d894869b0@default(draft) add gh
+  +---o  20:e02107f98737@default(draft) add gh
   | |
-  | o  19:10ffdd7e3cc9@default(draft) add gg
+  | o  19:24e63b319adf@default(draft) add gg
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
 
   $ hg fold --exact "19 + 18"
@@ -1348,13 +1348,13 @@
   > EOF
 
   $ glog -r "18::"
-  o  31:5cc6eda0f00d@default(draft) add gg
+  o  31:580886d07058@default(draft) add gg
   |
-  | @  30:30ecefd67c0a@default(draft) add unstableifparentisfolded
+  | @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
 
 Create a split commit
@@ -1376,25 +1376,25 @@
   1 changesets pruned
   1 new unstable changesets
   $ glog -r "18::"
-  @  35:072908d77206@default(draft) _pp
+  @  35:7a555adf2b4a@default(draft) _pp
   |
-  o  34:68e429987343@default(draft) _oo
+  o  34:2be4d2d5bf34@default(draft) _oo
   |
-  | o  33:030868870864@default(draft) add uu
+  | o  33:53f0c003e03e@default(draft) add uu
   | |
-  | x  32:7e9688cf0a1b@default(draft) oo+pp
+  | x  32:1bf2152f4f82@default(draft) oo+pp
   |/
-  | o  31:5cc6eda0f00d@default(draft) add gg
+  | o  31:580886d07058@default(draft) add gg
   | |
-  o |  30:30ecefd67c0a@default(draft) add unstableifparentisfolded
+  o |  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  20:db3d894869b0@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  18:0bb66d4c1968@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   $ hg evolve --rev "18::"
   move:[33] add uu
   atop:[35] _pp
-  working directory is now at 04fae07745d4
+  working directory is now at 43c3f5ef149f