diff tests/test-evolve-phase-divergence.t @ 4363:a2fdbece7ce1 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

--- a/tests/test-evolve-phase-divergence.t	Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-evolve-phase-divergence.t	Tue Jan 22 12:57:25 2019 -0500
@@ -114,7 +114,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -282,7 +281,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -433,7 +431,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -562,7 +559,6 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x
@@ -571,17 +567,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
 ---------------------------------------------
@@ -673,7 +660,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
@@ -776,7 +762,6 @@
   
 
   $ hg phase -r f3794e5a91dc --public --hidden
-  1 new phase-divergent changesets
 
 Resolution using `hg evolve --phase-divergent`
 ----------------------------------------------
@@ -885,7 +870,6 @@
   $ hg evolve --list
 
   $ hg phase -r 428f7900a969 --public --hidden
-  1 new phase-divergent changesets
 
   $ hg glog -r f3794e5a91dc::
   @  24:390acb97e50a added f
@@ -965,12 +949,11 @@
   1 changesets pruned
 
   $ hg phase -r 849cee0a874b --hidden --public
-  2 new phase-divergent changesets
 
   $ hg glog -r 428f7900a969::
   @  28:63ccb8ea7cae added n
   |   () draft
-  *  27:f313e2b90e70 added m
+  o  27:f313e2b90e70 added m
   |   () draft
   | o  26:849cee0a874b added m and n
   |/    () public
@@ -983,7 +966,6 @@
   atop:[26] added m and n
   computing new diff
   committed as 870e1c3eddc3
-  1 new orphan changesets
   recreate:[28] added n
   atop:[26] added m and n
   rebasing to destination parent: 428f7900a969
@@ -1078,12 +1060,11 @@
   1 changesets pruned
 
   $ hg phase -r 8a70f55b2af3 --public --hidden
-  2 new phase-divergent changesets
 
   $ hg glog -r 154b0179fb9b::
   @  34:e046341aa97c added q
   |   () draft
-  | *  33:6f8c250eecff added p
+  | o  33:6f8c250eecff added p
   |/    () draft
   | o  32:8a70f55b2af3 added p and q
   |/    () public
@@ -1221,7 +1202,6 @@
   1 changesets pruned
 
   $ hg phase 12ebe0d625d7 --hidden --public
-  1 new phase-divergent changesets
 
 Resolution of phase-divergent merge commit using `hg evolve`