--- a/tests/test-stabilize-result.t Thu Jun 18 15:25:51 2015 -0700
+++ b/tests/test-stabilize-result.t Thu Jun 18 15:56:56 2015 -0700
@@ -319,18 +319,20 @@
$ echo 'gotta break' >> a
$ hg amend
2 new divergent changesets
+# reamend so that the case is not the first precursor.
+ $ hg amend -m "More addition (2)"
$ hg phase 'divergent()'
21: draft
- 23: draft
+ 24: draft
$ hg evolve -qn
- hg update -c 36e188246d67 &&
+ hg update -c 0b336205a5d0 &&
hg merge f344982e63c4 &&
- hg commit -m "auto merge resolving conflict between 36e188246d67 and f344982e63c4"&&
+ hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
hg up -C 3932c176bbaa &&
hg revert --all --rev tip &&
- hg commit -m "`hg log -r 36e188246d67 --template={desc}`";
+ hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
$ hg evolve
- merge:[23] More addition
+ merge:[24] More addition (2)
with: [21] More addition
base: [15] More addition
merging a