diff -r 0eb80259f9cb -r aafd51f145ea tests/test-evolve-public-content-divergent.t --- a/tests/test-evolve-public-content-divergent.t Sat Apr 20 03:55:11 2019 +0200 +++ b/tests/test-evolve-public-content-divergent.t Tue Apr 23 12:28:32 2019 +0200 @@ -41,13 +41,10 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updating to a hidden changeset 5f6d8a4bf34a - (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) working directory parent is obsolete! (5f6d8a4bf34a) $ echo "I am second" >> b $ hg ci --amend -m "updated b" - 1 new content-divergent changesets $ hg glog @ 3:dcdaf152280a updated b @@ -138,13 +135,10 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updating to a hidden changeset 5f6d8a4bf34a - (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) working directory parent is obsolete! (5f6d8a4bf34a) $ echo "I am bar" > b $ hg ci --amend -m "updated b" - 1 new content-divergent changesets $ hg glog @ 3:0e805383168e updated b @@ -243,13 +237,10 @@ On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: $ hg up 2 --hidden -q - updating to a hidden changeset 155349b645be - (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) working directory parent is obsolete! (155349b645be) $ echo cc >> c $ hg ci --amend -m "updated c" - 2 new content-divergent changesets Lets change the phase to --public of branch which is pulled from server: $ hg phase --public -r 4 @@ -413,7 +404,6 @@ 1 changesets pruned $ hg prune 3 -s 4 --hidden 1 changesets pruned - 2 new content-divergent changesets Change phase to public for one head: $ hg phase -r 4 --public @@ -506,7 +496,6 @@ 1 changesets pruned $ hg prune 'min(desc("re:added d$"))' -s 'desc("added d c e")' --hidden 1 changesets pruned - 2 new content-divergent changesets Change phase to public for one head: $ hg phase --public -r 'max(desc("re:added d$"))' @@ -515,7 +504,7 @@ @ 5:93cd84bbdaca added d | public | - | * 4:f31bcc378766 added d c e + | o 4:f31bcc378766 added d c e | | draft content-divergent | | o | 2:155349b645be added c @@ -637,7 +626,6 @@ 1 changesets pruned $ hg prune 3 -s 4 --hidden 1 changesets pruned - 2 new content-divergent changesets Change phase to public for one head: $ hg phase --public -r 5 @@ -646,7 +634,7 @@ @ 5:93cd84bbdaca added d | public | - | * 4:9411ad1fe615 added d + | o 4:9411ad1fe615 added d | | draft content-divergent | | o | 2:155349b645be added c @@ -732,7 +720,6 @@ 1 changesets pruned $ hg prune 3 -s 4 --hidden 1 changesets pruned - 2 new content-divergent changesets Change phase to public for one head: $ hg phase --public -r 5 @@ -741,7 +728,7 @@ @ 5:93cd84bbdaca added d | public | - | * 4:3c17c7afaf6e added c e + | o 4:3c17c7afaf6e added c e | | draft content-divergent | | o | 2:155349b645be added c @@ -903,7 +890,6 @@ 1 changesets pruned $ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden 1 changesets pruned - 2 new content-divergent changesets Change phase to public for one head: $ hg phase --public -r 'max(desc("added d"))' @@ -912,7 +898,7 @@ @ 5:93cd84bbdaca added d | public | - | * 4:e568fd1029bb added c e + | o 4:e568fd1029bb added c e | | draft content-divergent | | o | 2:155349b645be added c @@ -953,7 +939,7 @@ | @@ -0,0 +1,1 @@ | +c | - | * 4:e568fd1029bb added c e + | o 4:e568fd1029bb added c e |/ draft content-divergent | | diff -r 5f6d8a4bf34a -r e568fd1029bb c @@ -989,7 +975,7 @@ $ hg obslog --all --rev tip --patch @ 93cd84bbdaca (5) added d | - | * e568fd1029bb (4) added c e + | o e568fd1029bb (4) added c e |/ x 9150fe93bec6 (3) added d rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000) @@ -1143,14 +1129,13 @@ 1 changesets pruned $ hg prune 2 -s 4 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 4 $ hg glog @ 4:f7c1071f1e7c added c | public | - | * 3:90522bccf499 added ch + | o 3:90522bccf499 added ch |/ draft content-divergent | o 1:5f6d8a4bf34a added b @@ -1234,14 +1219,13 @@ 1 changesets pruned $ hg prune 3 -s 5 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 5 $ hg glog @ 5:e800202333a4 added d | public | - | * 4:5acd58ef5066 added dh + | o 4:5acd58ef5066 added dh | | draft content-divergent | | o | 2:155349b645be added c @@ -1325,14 +1309,13 @@ 1 changesets pruned $ hg prune 2 -s 4 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 4 $ hg glog @ 4:f7c1071f1e7c added c | public | - | * 3:229da2719b19 added ch + | o 3:229da2719b19 added ch |/ draft content-divergent | o 1:5f6d8a4bf34a added b @@ -1438,14 +1421,13 @@ 1 changesets pruned $ hg prune 3 -s 5 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 5 $ hg glog @ 5:e800202333a4 added d | public | - | * 4:f89a8e2f86ac added dh + | o 4:f89a8e2f86ac added dh | | draft content-divergent | | o | 2:155349b645be added c @@ -1545,14 +1527,13 @@ 1 changesets pruned $ hg prune 3 -s 5 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 5 $ hg glog @ 5:e800202333a4 added d | public | - | * 4:db0b7bba0aae added dh + | o 4:db0b7bba0aae added dh | | draft content-divergent | | o | 2:155349b645be added c @@ -1653,14 +1634,13 @@ 1 changesets pruned $ hg prune 3 -s 5 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg phase --public -r 5 $ hg glog @ 5:e800202333a4 added d | public | - | * 4:67b19bbd770f added dh + | o 4:67b19bbd770f added dh | | draft content-divergent | | o | 2:155349b645be added c @@ -1755,7 +1735,6 @@ $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes rebasing 5:4ab2719bbab9 "c_E" rebasing 6:77ccbf8d837e "c_F" - 2 new content-divergent changesets $ hg sum parent: 8:a52ac76b45f5 @@ -1773,7 +1752,7 @@ content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e) $ hg log -G --patch - * changeset: 10:8ae8db670b4a + o changeset: 10:8ae8db670b4a | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -1786,7 +1765,7 @@ | @@ -0,0 +1,1 @@ | +c_F | - * changeset: 9:b4a584aea4bd + o changeset: 9:b4a584aea4bd | parent: 3:abb77b893f28 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -1888,7 +1867,6 @@ updating to "local" side of the conflict: c7d2d47c7240 merging "other" content-divergent changeset '0773642cfa95' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - 1 new orphan changesets merge:[8] c_F with: [10] c_F base: [6] c_F