--- a/tests/test-evolve-phase-divergence.t Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t Wed Jun 05 17:56:44 2019 +0200
@@ -123,7 +123,6 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
$ hg glog
@ 2:98bb3a6cfe1a tweak a
@@ -292,7 +291,6 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
$ hg glog
@ 4:d47f2b37ed82 added bar to foo
@@ -445,7 +443,6 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
$ hg glog
@ 7:2c3560aedead foo to bar
@@ -575,7 +572,6 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
$ hg obslog -r .
@ 334e300d6db5 (10) added x to x
@@ -584,17 +580,8 @@
rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg glog -r .^::
- @ 10:334e300d6db5 added x to x
- | (bm) draft
- | o 9:2352021b3785 added x to x
- | | () public
- | o 8:502e73736632 phase-divergent update to b756eb10ea73:
- | | () public
- | o 6:b756eb10ea73 added bar to bar
- |/ () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
- | () public
- ~
+ hg: parse error at 4: not a prefix: end
+ [255]
Using `hg evolve` to resolve phase-divergence
---------------------------------------------
@@ -687,7 +674,6 @@
Alice making the old changeset public to have content-divergence
$ hg phase -r dc88f5aa9bc9 --public --hidden
- 1 new phase-divergent changesets
$ hg glog
@ 14:13015a180eee y to y and foobar to foo
| () draft
@@ -791,7 +777,6 @@
$ hg phase -r f3794e5a91dc --public --hidden
- 1 new phase-divergent changesets
Resolution using `hg evolve --phase-divergent`
----------------------------------------------
@@ -899,7 +884,6 @@
$ hg evolve --list
$ hg phase -r 428f7900a969 --public --hidden
- 1 new phase-divergent changesets
$ hg glog -r f3794e5a91dc::
@ 24:390acb97e50a added f
@@ -976,12 +960,11 @@
1 changesets pruned
$ hg phase -r a51bce62c219 --hidden --public
- 2 new phase-divergent changesets
$ hg glog
@ 3:e1154ec0206a added n
| () draft
- * 2:4f25cd9cd2bf added m
+ o 2:4f25cd9cd2bf added m
| () draft
| o 1:a51bce62c219 added m and n
|/ () public
@@ -1103,12 +1086,11 @@
1 changesets pruned
$ hg phase -r 90859808ece6 --public --hidden
- 2 new phase-divergent changesets
$ hg glog
@ 3:bb87595f9a77 added q
| () draft
- | * 2:a47263294745 added p
+ | o 2:a47263294745 added p
|/ () draft
| o 1:90859808ece6 added p and q
|/ () public
@@ -1229,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
@@ -1389,7 +1370,6 @@
1 changesets pruned
$ hg phase 205b2f5ecb7b --hidden --public
- 1 new phase-divergent changesets
Resolution of phase-divergent merge commit using `hg evolve`
@@ -1499,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
@@ -1885,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