evolve: comparison tests/test-evolve-phase-divergence.t

equal deleted inserted replaced

-:4f98144368f3
+:d96016b46283
 XXX: pull should tell us how to see what is the new phase-divergent changeset
 $ hg pull ../public
 pulling from ../public
 searching for changes
 no changes found
-1 new phase-divergent changesets
 $ hg glog
 @  2:98bb3a6cfe1a tweak a
 |   () draft
 | o  1:4d1169d82e47 modify a
 $ hg pull ../public
 pulling from ../public
 searching for changes
 no changes found
-1 new phase-divergent changesets
 $ hg glog
 @  4:d47f2b37ed82 added bar to foo
 |   (bm) draft
 | o  3:aa071e5554e3 added foo to foo
 $ hg pull ../public
 pulling from ../public
 searching for changes
 no changes found
-1 new phase-divergent changesets
 $ hg glog
 @  7:2c3560aedead foo to bar
 |   (bm) draft
 | o  6:b756eb10ea73 added bar to bar
 $ hg pull ../public
 pulling from ../public
 searching for changes
 no changes found
-1 new phase-divergent changesets
 $ hg obslog -r .
 @  334e300d6db5 (10) added x to x
 |
 o  2352021b3785 (9) added x to x
 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
+hg: parse error at 4: not a prefix: end
-|   (bm) draft
+[255]
-| 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
-~
 Using `hg evolve` to resolve phase-divergence
 ---------------------------------------------
 $ hg evolve --phase-divergent
 $ hg amend
 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
 | o  12:dc88f5aa9bc9 y to y and foobar to foo
 | |   () public
 x  f3794e5a91dc (17) added l to l
 rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 $ hg phase -r f3794e5a91dc --public --hidden
-1 new phase-divergent changesets
 Resolution using `hg evolve --phase-divergent`
 ----------------------------------------------
 $ hg evolve --phase-divergent
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg evolve --list
 $ hg phase -r 428f7900a969 --public --hidden
-1 new phase-divergent changesets
 $ hg glog -r f3794e5a91dc::
 @  24:390acb97e50a added f
 |   () draft
 | o  23:428f7900a969 added g
 $ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split
 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
 o  0:d3873e73d99e init
 () public
 $ hg evolve --all --phase-divergent
 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
 committed as 89ba615ea1ec
 working directory is now at 89ba615ea1ec
 $ hg prune -r 90859808ece6 --succ a47263294745 --succ bb87595f9a77 --split
 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
 o  0:d3873e73d99e init
 () public
 $ echo n2 > n
 $ 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
 o  0:d3873e73d99e init
 () public
 $ hg evolve --all --phase-divergent
 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
 committed as 88b0dae5369a
 working directory is now at 88b0dae5369a
 $ hg prune -r 205b2f5ecb7b --succ .
 1 changesets pruned
 $ hg phase 205b2f5ecb7b --hidden --public
-1 new phase-divergent changesets
 Resolution of phase-divergent merge commit using `hg evolve`
 XXX: we should handle phase-divergent merges
 $ hg evolve --phase-divergent
 > VIII
 > IX
 > 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
 ~  parent:      0:6d1fdf6de7e2
 user:        test
 The public predecessors deletes'a', 'b' and 'c',
 If was amended to only delete 'a', and 'c'
 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
 committed as 84aa492b3c37
 working directory is now at 84aa492b3c37

branch	mercurial-4.4
changeset 4562	d96016b46283
parent 4553	aafd51f145ea
child 4675	79bc0f1a832e