diff tests/test-evolve-content-divergent-interrupted.t @ 4516:f54bb6eaf5e6 mercurial-4.4

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

--- a/tests/test-evolve-content-divergent-interrupted.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Thu Apr 11 22:44:53 2019 +0200
@@ -54,19 +54,16 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
   $ echo foobar > d
   $ hg amend
-  2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -129,7 +126,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -152,14 +149,12 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > c
   $ hg amend
-  2 new orphan changesets
   $ hg up ca1b80f7960a --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (ca1b80f7960a)
   (use 'hg evolve' to update to its successor: 2ba73e31f264)
   $ echo foobar > c
   $ hg amend
-  2 new content-divergent changesets
   $ echo bar > c
   $ hg amend
 
@@ -168,13 +163,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -206,7 +201,6 @@
   [1]
 
   $ hg evolve --abort
-  2 new content-divergent changesets
   evolve aborted
   working directory is now at 491e10505bae
 
@@ -215,13 +209,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -235,7 +229,7 @@
       () draft
 
   $ hg obslog -r . --all
-  *  2ba73e31f264 (8) added c
+  o  2ba73e31f264 (8) added c
   |
   | @  491e10505bae (10) added c
   | |
@@ -278,19 +272,16 @@
   $ hg amend
 
   $ hg up --hidden c41c793e0ef1
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
   $ echo bar > d
   $ hg amend
-  2 new content-divergent changesets
 
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -318,7 +309,7 @@
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -342,7 +333,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -373,7 +364,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft