tests/test-sharing.t
branchmercurial-3.7
changeset 1818 f23df9d65565
parent 1748 83cf722eafc3
child 1751 bc590681de77
--- a/tests/test-sharing.t	Tue Feb 28 17:08:14 2017 +0100
+++ b/tests/test-sharing.t	Tue Feb 28 17:11:51 2017 +0100
@@ -89,7 +89,6 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 other heads for branch "default"
 
 Figure SG03
   $ hg shortlog --hidden -G
@@ -120,7 +119,6 @@
   $ cd ../test-repo
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 other heads for branch "default"
   $ hg shortlog --hidden -G
   @  4:de6151c48e1c  draft  fix bug 37
   |
@@ -221,7 +219,6 @@
   |/
   @  1:de6151c48e1c  public  fix bug 37
   |
-  ~
 
 Bob commits a draft changeset, pushes to review repo.
   $ cd ../bob
@@ -297,13 +294,11 @@
   |/
   @  1:de6151c48e1c  public  fix bug 37
   |
-  ~
   $ hg --hidden -R ../public shortlog -G -r 1::
   o  2:540ba8f317e6  public  implement feature X (v3)
   |
   o  1:de6151c48e1c  public  fix bug 37
   |
-  ~
 
 How do things look in the review repo?
   $ cd ../review
@@ -320,7 +315,6 @@
   |/
   @  1:de6151c48e1c  public  fix bug 37
   |
-  ~
 
 Meantime, Alice is back from lunch. While she was away, Bob approved
 her change, so now she can publish it.
@@ -334,7 +328,6 @@
   |/
   o  1:de6151c48e1c  public  fix bug 37
   |
-  ~
   $ hg outgoing -q ../public
   4:cbdfbd5a5db2
   $ hg push ../public
@@ -356,10 +349,8 @@
   $ hg log -G -q -r 'head()'
   o  5:540ba8f317e6
   |
-  ~
-  @  4:cbdfbd5a5db2
-  |
-  ~
+  | @  4:cbdfbd5a5db2
+  |/
   $ hg --hidden shortlog -G -r 1::
   o  5:540ba8f317e6  public  implement feature X (v3)
   |
@@ -371,7 +362,6 @@
   |/
   o  1:de6151c48e1c  public  fix bug 37
   |
-  ~
 
 Alice rebases her draft changeset on top of Bob's public changeset and
 publishes the result.
@@ -411,7 +401,6 @@
   |/
   @  1:de6151c48e1c  public  fix bug 37
   |
-  ~
   $ hg --hidden -R ../public shortlog -G -r 1::
   o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
@@ -419,7 +408,6 @@
   |
   o  1:de6151c48e1c  public  fix bug 37
   |
-  ~
   $ cd ..
 
 Setup for "cowboy mode" shared mutable history (to illustrate divergent
@@ -474,7 +462,6 @@
   |/
   o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
-  ~
 
 Bob discovers the divergence.
   $ hg pull ../alice
@@ -500,7 +487,6 @@
   |/
   o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
-  ~
   $ hg --hidden shortlog -r 'successors(2fe6)'
   6:a360947f6faf  draft  fix bug 24 (v2 by bob)
   7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
@@ -530,7 +516,6 @@
   |/
   o  3:a06ec1bf97bd  public  fix bug 15 (v2)
   |
-  ~
   $ hg --hidden shortlog -r 'precursors(9)'
   6:a360947f6faf  draft  fix bug 24 (v2 by bob)
   7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)