# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1477745757 -7200
# Node ID 147aa58d8962417881bc39d676ff708ff1f9a079
# Parent  83cf722eafc3a82856c985229d2b70f95d7b5b1e# Parent  e878999e6af4907d550040ff08fda2e6c65d53b5
merge with latest fix

diff -r e878999e6af4 -r 147aa58d8962 tests/test-amend.t
--- a/tests/test-amend.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-amend.t	Sat Oct 29 14:55:57 2016 +0200
@@ -107,7 +107,7 @@
   $ HGUSER=
   $ hg amend -e --config ui.username= -m "empty user"
   abort: no username supplied
-  (use 'hg config --edit' to set your username)
+  (use "hg config --edit" to set your username)
   [255]
   $ hg sum
   parent: 8:* tip (glob)
diff -r e878999e6af4 -r 147aa58d8962 tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-evolve-order.t	Sat Oct 29 14:55:57 2016 +0200
@@ -155,7 +155,6 @@
   |/
   o  15:739f18ac1d03@default(draft) add _d
   |
-  ~
 
 Second set of stack with no successor for b2_:
   $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
@@ -197,7 +196,6 @@
   |/
   o  15:739f18ac1d03@default(draft) add _d
   |
-  ~
 
 Solve the full second stack and only part of the first one
   $ echo "(desc(_d)::) - desc(c3_)"
@@ -234,7 +232,6 @@
   |/
   o  15:739f18ac1d03@default(draft) add _d
   |
-  ~
 
 Test multiple revision with some un-evolvable because parent is splitted
 ------------------------------------------------------------------------
diff -r e878999e6af4 -r 147aa58d8962 tests/test-evolve.t
--- a/tests/test-evolve.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-evolve.t	Sat Oct 29 14:55:57 2016 +0200
@@ -595,7 +595,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue')
+  (use hg resolve and hg graft --continue)
   [255]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
@@ -1225,7 +1225,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
   $ hg evolve --rev 23 --any
   abort: cannot specify both "--rev" and "--any"
@@ -1264,7 +1263,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Check that prune respects the allowunstable option
   $ hg up -C .
@@ -1294,7 +1292,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
   $ hg up 19
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit c5_
@@ -1316,7 +1313,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Check that fold respects the allowunstable option
   $ hg up edc3c9de504e
@@ -1334,7 +1330,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
   $ hg fold --exact "19 + 18"
   abort: cannot fold chain not ending with a head or with branching
@@ -1362,7 +1357,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Create a split commit
   $ printf "oo" > oo;
@@ -1399,7 +1393,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
   $ hg evolve --rev "18::"
   move:[33] add uu
   atop:[35] _pp
@@ -1454,7 +1447,6 @@
   |/
   o  36:43c3f5ef149f@default(draft) add uu
   |
-  ~
 
   $ hg status newlyadded
   A newlyadded
@@ -1526,7 +1518,6 @@
   $ glog -r .
   @  44:41bf1183869c@default(draft) amended
   |
-  ~
 
 no new commit is created here because the date is the same
   $ HGEDITOR=cat hg metaedit
@@ -1550,7 +1541,6 @@
   |
   o  36:43c3f5ef149f@default(draft) add uu
   |
-  ~
 
 TODO: don't create a new commit in this case
   $ hg metaedit --config defaults.metaedit=
diff -r e878999e6af4 -r 147aa58d8962 tests/test-inhibit.t
--- a/tests/test-inhibit.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-inhibit.t	Sat Oct 29 14:55:57 2016 +0200
@@ -551,7 +551,6 @@
   |/
   o  14:d66ccb8c5871 add cL
   |
-  ~
   $ hg strip -r 210589181b14
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at d66ccb8c5871
@@ -573,7 +572,6 @@
   |/
   o  14:d66ccb8c5871 add cL
   |
-  ~
 
 Test prunestrip
 
@@ -589,7 +587,6 @@
   |
   @  14:d66ccb8c5871 add cL foo
   |
-  ~
 
 Check that --hidden used with inhibit does not hide every obsolete commit
 We show the log before and after a log -G --hidden, they should be the same
@@ -821,7 +818,6 @@
   $ hg log -G  -r "25::"
   @  25:71eb4f100663 add pk
   |
-  ~
   $ hg up -C 22
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit Dk
@@ -835,7 +831,6 @@
   |
   o  25:71eb4f100663 add pk
   |
-  ~
 
 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
 Rebase the first two revs of the stack onto dest, we expect to see one new
@@ -857,7 +852,6 @@
   |/
   o  25:71eb4f100663 add pk
   |
-  ~
   $ hg prune 28 -s 27
   1 changesets pruned
   $ hg up 25
@@ -878,7 +872,6 @@
   |/
   @  25:71eb4f100663 add pk
   |
-  ~
 
 Rebase the same stack in full on the destination, we expect it to disappear
 and only see the top revision added to destination. We don\'t expect 29 to be
@@ -896,7 +889,6 @@
   |
   @  25:71eb4f100663 add pk
   |
-  ~
 
 Pulling from a inhibit repo to a non-inhibit repo should work
 
diff -r e878999e6af4 -r 147aa58d8962 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-obsolete.t	Sat Oct 29 14:55:57 2016 +0200
@@ -457,7 +457,6 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 other heads for branch "default"
   $ hg id -n
   8
 
diff -r e878999e6af4 -r 147aa58d8962 tests/test-sharing.t
--- a/tests/test-sharing.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-sharing.t	Sat Oct 29 14:55:57 2016 +0200
@@ -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)
diff -r e878999e6af4 -r 147aa58d8962 tests/test-split.t
--- a/tests/test-split.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-split.t	Sat Oct 29 14:55:57 2016 +0200
@@ -267,9 +267,9 @@
   |
   o  changeset:   14:aec57822a8ff
   |  user:        test
-  ~  date:        Thu Jan 01 00:00:00 1970 +0000
-     summary:     split1
-  
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     split1
+  |
   $ hg split <<EOF
   > y
   > y
@@ -313,9 +313,9 @@
   |
   o  changeset:   14:aec57822a8ff
   |  user:        test
-  ~  date:        Thu Jan 01 00:00:00 1970 +0000
-     summary:     split1
-  
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     split1
+  |
   $ hg book
      bookA                     19:a2b5c9d9b362
    * bookB                     19:a2b5c9d9b362
diff -r e878999e6af4 -r 147aa58d8962 tests/test-userguide.t
--- a/tests/test-userguide.t	Sat Oct 29 14:49:37 2016 +0200
+++ b/tests/test-userguide.t	Sat Oct 29 14:55:57 2016 +0200
@@ -76,7 +76,6 @@
   |
   @  3:934359450037  draft  implement feature Y
   |
-  ~
 
 example 5: uncommit files at head (figure 4)
   $ echo 'relevant' >> file1.c
@@ -92,7 +91,6 @@
   |/
   o  3:934359450037  draft  implement feature Y
   |
-  ~
   $ hg parents --template '{rev}:{node|short}  {desc|firstline}\n{files}\n'
   6:c8defeecf7a4  fix bug 234
   file1.c
@@ -123,7 +121,6 @@
   |/
   o  6:c8defeecf7a4  draft  fix bug 234
   |
-  ~
   $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)'
   10:171c6a79a27b
   $ hg --hidden log -q -r 'precursors(10)'
@@ -159,7 +156,6 @@
   |
   o  10:171c6a79a27b  draft  fix bug 64
   |
-  ~
 
 example 7: amend an older changeset (figures 6, 7)
   $ hg update -q 11
@@ -184,7 +180,6 @@
   |/
   o  10:171c6a79a27b  draft  fix bug 64
   |
-  ~
   $ hg evolve -q --all
   $ hg shortlog -G -r 10::
   @  17:91b4b0f8b5c5  draft  feature 23
@@ -195,7 +190,6 @@
   |
   o  10:171c6a79a27b  draft  fix bug 64
   |
-  ~
 
 setup for example 8: prune an older changeset (figure 8)
   $ echo 'useful' >> file1.c
@@ -213,7 +207,6 @@
   |
   o  17:91b4b0f8b5c5  draft  feature 23
   |
-  ~
 
 example 8: prune an older changeset (figures 8, 9)
   $ hg prune 19
@@ -226,7 +219,6 @@
   |
   o  18:1f33e68b18b9  draft  useful work
   |
-  ~
   $ hg evolve -q --all --any
   $ hg --hidden shortlog -G -r 18::
   @  21:4393e5877437  draft  more work
@@ -237,7 +229,6 @@
   |/
   o  18:1f33e68b18b9  draft  useful work
   |
-  ~
 
 example 9: uncommit files from an older changeset (discard changes)
 (figure 10)
@@ -255,7 +246,6 @@
   |
   o  21:4393e5877437  draft  more work
   |
-  ~
   $ hg uncommit file2.c
   1 new unstable changesets
   $ hg status
@@ -276,7 +266,6 @@
   |/
   o  21:4393e5877437  draft  more work
   |
-  ~
   $ rm file2.c.orig
 
 example 10: uncommit files from an older changeset (keep changes)
@@ -295,7 +284,6 @@
   |
   o  25:0d972d6888e6  draft  fix bug 67
   |
-  ~
   $ hg uncommit file2.c
   1 new unstable changesets
   $ hg status
@@ -312,7 +300,6 @@
   |/
   o  25:0d972d6888e6  draft  fix bug 67
   |
-  ~
   $ hg evolve --all --any
   move:[27] new feature
   atop:[28] fix a bug
@@ -330,4 +317,3 @@
   |/
   o  25:0d972d6888e6  draft  fix bug 67
   |
-  ~