diff tests/test-evolve-content-divergence.t @ 4173:e268f7fd7839 mercurial-4.4

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

--- a/tests/test-evolve-content-divergence.t	Fri Oct 12 15:15:07 2018 +0200
+++ b/tests/test-evolve-content-divergence.t	Fri Oct 12 15:15:09 2018 +0200
@@ -34,15 +34,15 @@
 have different branches
 -------------------------------------------------------------------------------
 
-  $ hg branch -r . foobar
-  changed branch on 1 changesets
+  $ hg branch foobar
+  marked working directory as branch foobar
+  (branches are permanent and global, did you want a bookmark?)
+  $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   0 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: 9e5dffcb3d48)
+  (use 'hg evolve' to update to its successor: bdeedce1f621)
   $ echo bar > d
   $ hg branch watwat
   marked working directory as branch watwat
@@ -52,7 +52,7 @@
   $ hg glog
   @  6:264b04f771fb added d
   |   () [watwat] draft
-  | *  5:9e5dffcb3d48 added d
+  | o  5:bdeedce1f621 added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -69,7 +69,7 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset '9e5dffcb3d48'
+  merging "other" content-divergent changeset 'bdeedce1f621'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
@@ -109,7 +109,7 @@
   $ hg glog
   @  9:59081c9c425a added a d with bar in it, expect some beers
   |   () [default] draft
-  | *  8:f621d00f5f0e added d
+  | o  8:f621d00f5f0e added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -146,8 +146,6 @@
   $ hg amend -m "foo to d"
 
   $ hg up a9d6fd6b5e40 --hidden
-  updating to a hidden changeset a9d6fd6b5e40
-  (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (a9d6fd6b5e40)
   (use 'hg evolve' to update to its successor: b10b07a394f1)
@@ -158,7 +156,7 @@
   $ hg glog
   @  12:0bb497fed24a foo to d
   |   () [default] draft
-  | *  11:b10b07a394f1 foo to d
+  | o  11:b10b07a394f1 foo to d
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -206,8 +204,6 @@
   $ hg amend -m "bar to d, expect beers"
 
   $ hg up 11175423b5dc --hidden
-  updating to a hidden changeset 11175423b5dc
-  (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (11175423b5dc)
   (use 'hg evolve' to update to its successor: 27f0463f169a)
@@ -218,7 +214,7 @@
   $ hg glog
   @  15:f542037ddf31 wat to d, wat?
   |   () [default] draft
-  | *  14:27f0463f169a bar to d, expect beers
+  | o  14:27f0463f169a bar to d, expect beers
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -318,13 +314,13 @@
   2 new content-divergent changesets
 
   $ hg glog
-  *  6:da4b96f4a8d6 added b
+  o  6:da4b96f4a8d6 added b
   |   () [default] draft
   | @  5:7ed0642d644b added b
   | |   () [default] draft
-  | | *  4:c41c793e0ef1 added d
+  | | o  4:c41c793e0ef1 added d
   | | |   () [default] draft
-  | | *  3:ca1b80f7960a added c
+  | | o  3:ca1b80f7960a added c
   | | |   () [default] draft
   | | x  2:b1661037fa25 added b
   | |/    () [default] draft
@@ -346,9 +342,9 @@
   $ hg glog
   @  8:171614c9a791 added b
   |   () [default] draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () [default] draft
-  | *  3:ca1b80f7960a added c
+  | o  3:ca1b80f7960a added c
   | |   () [default] draft
   | x  2:b1661037fa25 added b
   |/    () [default] draft
@@ -409,8 +405,6 @@
   $ hg amend -m "added foo to x"
 
   $ hg up 71a392c714b5 --hidden
-  updating to a hidden changeset 71a392c714b5
-  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (71a392c714b5)
   (use 'hg evolve' to update to its successor: 1e1a50385a7d)
@@ -421,7 +415,7 @@
   $ hg glog
   @  13:1e4f6b3bb39b added x
   |   () [default] draft
-  | *  12:1e1a50385a7d added foo to x
+  | o  12:1e1a50385a7d added foo to x
   | |   () [bar] draft
   o |  10:4ae4427ee9f8 added d
   | |   () [default] draft
@@ -494,8 +488,6 @@
   $ hg amend
 
   $ hg up fc6ad2bac162 --hidden
-  updating to a hidden changeset fc6ad2bac162
-  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (fc6ad2bac162)
   (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
@@ -508,7 +500,7 @@
   $ hg glog
   @  19:b4575ed6fcfc added y
   |   () [bar] draft
-  | *  17:2a9f6ccbdeba added y
+  | o  17:2a9f6ccbdeba added y
   | |   () [default] draft
   o |  15:b006cf317e0e added foo to x
   | |   () [bar] draft
@@ -629,8 +621,6 @@
   $ hg amend
 
   $ hg up daf1de08f3b0 --hidden
-  updating to a hidden changeset daf1de08f3b0
-  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (daf1de08f3b0)
   (use 'hg evolve' to update to its successor: 3f7a1f693080)
@@ -643,7 +633,7 @@
   $ hg glog
   @  25:53242575ffa9 added z
   |   () [bar] draft
-  | *  23:3f7a1f693080 added z
+  | o  23:3f7a1f693080 added z
   | |   () [default] draft
   o |  21:7bbcf24ddecf added y
   | |   () [bar] draft
@@ -864,26 +854,26 @@
   adding file changes
   added 4 changesets with 0 changes to 4 files (+1 heads)
   5 new obsolescence markers
-  8 new content-divergent changesets
   new changesets 82b74d5dc678:15c781f93cac
   (run 'hg heads' to see heads, 'hg merge' to merge)
+  8 new content-divergent changesets
 
   $ hg glog
-  *  12:15c781f93cac added d
+  o  12:15c781f93cac added d
   |   () [default] draft
-  *  11:9e5fb1d5b955 added c
+  o  11:9e5fb1d5b955 added c
   |   () [default] draft
-  *  10:88516dccf68a added b
+  o  10:88516dccf68a added b
   |   () [default] draft
-  *  9:82b74d5dc678 watbar to a
+  o  9:82b74d5dc678 watbar to a
   |   () [default] draft
   | @  8:c72d2885eb51 added d
   | |   () [default] draft
-  | *  7:3ce4be6d8e5e added c
+  | o  7:3ce4be6d8e5e added c
   | |   () [default] draft
-  | *  6:d5f148423c16 added b
+  | o  6:d5f148423c16 added b
   | |   () [default] draft
-  | *  5:8e222f257bbf watbar to a
+  | o  5:8e222f257bbf watbar to a
   |/    () [default] draft
   o  0:8fa14d15e168 added hgignore
       () [default] draft
@@ -895,7 +885,6 @@
   updating to "local" side of the conflict: 8e222f257bbf
   merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  6 new orphan changesets
   merge:[6] added b
   with: [10] added b
   base: [2] added b