diff tests/test-sharing.t @ 5766:82da27321e91 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 31 Jan 2021 16:15:26 +0800
parents 011b53a9d03c 08c30eef85d3
children 55e9987b8384
line wrap: on
line diff
--- a/tests/test-sharing.t	Sun Jan 31 16:06:16 2021 +0800
+++ b/tests/test-sharing.t	Sun Jan 31 16:15:26 2021 +0800
@@ -102,7 +102,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 522d503432a2 (1 drafts)
+  new changesets 522d503432a2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "522d503432a2: fix bug 37"
   1 other heads for branch "default"
@@ -460,7 +460,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets b2be254b3b9f (1 drafts)
+  new changesets b2be254b3b9f
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'better fix (alice)' >> file1
   $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
@@ -489,7 +489,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   2 new content-divergent changesets
-  new changesets e3a586fd2377 (1 drafts)
+  new changesets e3a586fd2377
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Figure SG09: multiple heads! divergence! oh my!