diff -r 0eb80259f9cb -r aafd51f145ea tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Sat Apr 20 03:55:11 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Tue Apr 23 12:28:32 2019 +0200
@@ -201,25 +201,24 @@
 Creating content-divergence with branch change where base, divergent and other
 have different branches
 
-  $ hg branch -r . foobar
-  changed branch on 1 changesets
+  $ hg branch --force 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
   $ hg amend
-  2 new content-divergent changesets
 
   $ 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
@@ -236,7 +235,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
@@ -312,19 +311,16 @@
   $ 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)
   $ echo babar > d
   $ hg amend -m "foo to d"
-  2 new content-divergent changesets
 
   $ 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
@@ -372,19 +368,16 @@
   $ 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)
   $ echo wat > d
   $ hg amend -m "wat to d, wat?"
-  2 new content-divergent changesets
 
   $ 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
@@ -482,8 +475,6 @@
   $ echo 'babar' >> a
   $ hg amend
   $ hg up --hidden 'min(desc("More addition"))'
-  updating to a hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: fc6349f931da)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: fc6349f931da)
@@ -492,11 +483,10 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new content-divergent changesets
   $ glog
   @  3:051337a45e7c@default(draft) bk:[] More addition
   |
-  | *  2:fc6349f931da@default(draft) bk:[] More addition
+  | o  2:fc6349f931da@default(draft) bk:[] More addition
   |/
   o  0:6569b5a81c7e@default(public) bk:[] root
   
@@ -575,14 +565,11 @@
 
 
   $ hg up --hidden 'min(desc("More addition"))'
-  updating to a hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (867e43582046)
   (use 'hg evolve' to update to its successor: 5bf84d1d71d1)
   $ echo 'gotta break' >> a
   $ hg amend
-  2 new content-divergent changesets
 
 # reamend so that the case is not the first precursor.
 
@@ -594,7 +581,7 @@
   $ glog
   @  6:13c1b75640a1@default(draft) bk:[] More addition (2)
   |
-  | *  4:5bf84d1d71d1@default(draft) bk:[] More addition
+  | o  4:5bf84d1d71d1@default(draft) bk:[] More addition
   |/
   o  0:6569b5a81c7e@default(public) bk:[] root
   
@@ -752,8 +739,6 @@
   > EOF
   $ hg commit --amend -m E2
   $ hg --hidden update -r 'desc(E1)'
-  updating to a hidden changeset 4a250e5bd992
-  (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (4a250e5bd992)
   (use 'hg evolve' to update to its successor: 084ae625fa51)
@@ -791,7 +776,6 @@
   > IX
   > EOF
   $ hg commit --amend -m E3
-  2 new content-divergent changesets
   $ hg log -G --patch --hidden
   @  3:19ed1bf64a2c@default(draft) E3 [content-divergent]
   |  diff --git a/numbers b/numbers
@@ -810,7 +794,7 @@
   |  -II
   |  +ii
   |
-  | *  2:084ae625fa51@default(draft) E2 [content-divergent]
+  | o  2:084ae625fa51@default(draft) E2 [content-divergent]
   |/   diff --git a/letters b/letters
   |    --- a/letters
   |    +++ b/letters
@@ -896,7 +880,7 @@
     content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992)
   
   $ hg obslog --all --patch
-  *  084ae625fa51 (2) E2
+  o  084ae625fa51 (2) E2
   |
   | @  19ed1bf64a2c (3) E3
   |/