diff tests/test-sharing.t @ 4512:7a779a288793 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

--- a/tests/test-sharing.t	Tue Jan 22 12:54:43 2019 -0500
+++ b/tests/test-sharing.t	Thu Apr 11 22:41:41 2019 +0200
@@ -423,8 +423,9 @@
   ~
   $ cd ..
 
-Setup for "cowboy mode" shared mutable history (to illustrate divergent
-and bumped changesets).
+Setup for shared mutable history (to illustrate content-divergence and
+phase-divergent changesets).
+
   $ rm -rf review alice bob
   $ hg clone public alice
   updating to branch default
@@ -446,8 +447,7 @@
   $ hg shortlog -r .
   4:2fe6c4bd32d0  draft  fix bug 24 (v1)
 
-Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft
-changeset and amends it herself. ::
+Alice pulls Bob's draft changeset and amends it herself. ::
 
   $ cd ../alice
   $ hg pull -u ../bob
@@ -518,12 +518,12 @@
   base: [4] fix bug 24 (v1)
   merging "other" content-divergent changeset 'e3f99ce9d9cd'
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 711ede2d7a26
+  working directory is now at b1499b0f03ca
   $ hg log -q -r 'contentdivergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::
-  @  7:711ede2d7a26  draft  fix bug 24 (v2 by bob)
+  @  7:b1499b0f03ca  draft  fix bug 24 (v2 by bob)
   |
   | x  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   |/
@@ -534,7 +534,7 @@
   o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
   ~
-  $ hg --hidden shortlog -r 'precursors(711ede2d7a26)'
+  $ hg --hidden shortlog -r 'precursors(b1499b0f03ca)'
   5:a360947f6faf  draft  fix bug 24 (v2 by bob)
   6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   $ cat file1