--- a/tests/test-evolve-phase-divergence.t Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t Tue Apr 23 12:28:32 2019 +0200
@@ -975,7 +975,6 @@
recreate:[2] added m
atop:[1] added m and n
committed as 86419909e017
- 1 new orphan changesets
recreate:[3] added n
atop:[1] added m and n
rebasing to destination parent: d3873e73d99e
@@ -1212,12 +1211,11 @@
$ hg amend
$ hg phase -r a51bce62c219 --public --hidden
- 2 new phase-divergent changesets
$ hg glog
@ 4:52ca78bb98c7 added n
| () draft
- * 2:4f25cd9cd2bf added m
+ o 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () public
@@ -1235,7 +1233,6 @@
recreate:[2] added m
atop:[1] added m and n
committed as 86419909e017
- 1 new orphan changesets
recreate:[4] added n
atop:[1] added m and n
rebasing to destination parent: d3873e73d99e
@@ -1482,7 +1479,6 @@
> EOF
$ hg commit --amend -m E2
$ hg --hidden phase --public --rev 'desc(E1)'
- 1 new phase-divergent changesets
$ hg log -G --patch --hidden --rev 'not desc("root")'
@ changeset: 2:599454370881
| tag: tip
@@ -1868,7 +1864,6 @@
so the fixup should add back 'b'.
$ hg phase -p -r dff6e52f5e41 --hidden
- 1 new phase-divergent changesets
$ hg evolve --phase-divergent
recreate:[2] delete a
atop:[1] delete a