Mercurial > evolve

changeset 3102:6604d96fc73c mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output change in rebase This backed out changeset d12c82fd1143 and a couple of other changes. The change are not relevant in Mercurial < 4.4/
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 17:30:20 +0200
parents 7f949debd50d
children 13cafb250c1a
files tests/test-topic-change.t tests/test-topic-dest.t tests/test-topic-rebase.t tests/test-topic-stack.t tests/test-topic-tutorial.t
diffstat 5 files changed, 35 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-topic-change.t	Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-change.t	Fri Oct 20 17:30:20 2017 +0200
@@ -180,13 +180,13 @@
      Added a  ()
   
   $ hg rebase -s 11 -d 22
-  rebasing 11:1315a3808ed0 "Added d" (foo)
+  rebasing 11:1315a3808ed0 "Added d"
   switching to topic foo
-  rebasing 16:edc4a6b9ea60 "Added e" (bar)
+  rebasing 16:edc4a6b9ea60 "Added e"
   switching to topic bar
-  rebasing 17:82e0b14f4d9e "Added f" (bar)
-  rebasing 18:e7b418d79a05 "Added g" (bar)
-  rebasing 20:c2d6b7df5dcf "Added h" (foobar)
+  rebasing 17:82e0b14f4d9e "Added f"
+  rebasing 18:e7b418d79a05 "Added g"
+  rebasing 20:c2d6b7df5dcf "Added h"
   switching to topic foobar
 
   $ hg glog
--- a/tests/test-topic-dest.t	Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-dest.t	Fri Oct 20 17:30:20 2017 +0200
@@ -109,7 +109,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 4:cb7ae72f4a80 "babar" (elephant)
+  rebasing 4:cb7ae72f4a80 "babar"
   switching to topic elephant
   $ hg log -G
   @  7 (elephant) babar
@@ -130,7 +130,7 @@
   switching to topic monkey
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:d832ddc604ec "zephir" (monkey)
+  rebasing 5:d832ddc604ec "zephir"
   switching to topic monkey
   $ hg log -G
   @  8 (monkey) zephir
@@ -173,7 +173,7 @@
   o  0 () c_alpha
   
   $ hg rebase
-  rebasing 9:d79a104e2902 "Huc" (tip monkey)
+  rebasing 9:d79a104e2902 "Huc" (tip)
   $ hg log -G
   @  10 (monkey) Huc
   |
@@ -225,7 +225,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
-  rebasing 7:8d0b77140b05 "babar" (elephant)
+  rebasing 7:8d0b77140b05 "babar"
   switching to topic elephant
   $ hg up monkey
   switching to topic monkey
--- a/tests/test-topic-rebase.t	Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-rebase.t	Fri Oct 20 17:30:20 2017 +0200
@@ -71,7 +71,7 @@
   switching to topic myfeature
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 1:39e7a938055e "add feature1" (myfeature)
+  rebasing 1:39e7a938055e "add feature1"
   switching to topic myfeature
   $ hg stack
   ### topic: myfeature
@@ -120,7 +120,7 @@
   switching to topic myotherfeature
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+  rebasing 5:81f854012ec5 "myotherfeature1"
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
@@ -134,7 +134,7 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+  rebasing 5:81f854012ec5 "myotherfeature1"
 
 Check the the commit has the right topic
 
--- a/tests/test-topic-stack.t	Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-stack.t	Fri Oct 20 17:30:20 2017 +0200
@@ -328,8 +328,8 @@
 Make things linear again
 
   $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
-  rebasing 4:0f9ac936c87d "c_e" (foo)
-  rebasing 5:6559e6d93aea "c_f" (foo)
+  rebasing 4:0f9ac936c87d "c_e"
+  rebasing 5:6559e6d93aea "c_f"
   $ hg log -G
   o  8 default {foo} draft c_f
   |
@@ -397,8 +397,8 @@
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
   $ hg rebase -d . -s 'desc(c_g)'
-  rebasing 9:81264ae8a36a "c_g" (foo)
-  rebasing 10:fde5f5941642 "c_h" (foo)
+  rebasing 9:81264ae8a36a "c_g"
+  rebasing 10:fde5f5941642 "c_h"
   $ hg log -G
   o  13 default {foo} draft c_h
   |
@@ -463,8 +463,8 @@
   
 Converting into a linear chain
   $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
-  rebasing 7:215bc359096a "c_e" (foo)
-  rebasing 8:ec9267b3f33f "c_f" (foo)
+  rebasing 7:215bc359096a "c_e"
+  rebasing 8:ec9267b3f33f "c_f"
 
   $ hg log -G
   o  15 default {foo} draft c_f
@@ -509,16 +509,16 @@
   o  0 default {} public c_a
   
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
-  rebasing 15:77082e55de88 "c_f" (foo)
+  rebasing 15:77082e55de88 "c_f"
   switching to topic foo
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
-  rebasing 12:0c3e8aed985d "c_g" (foo)
+  rebasing 12:0c3e8aed985d "c_g"
   switching to topic foo
-  rebasing 13:b9e4f3709bc5 "c_h" (foo)
-  rebasing 16:4bc813530301 "c_e" (foobar)
+  rebasing 13:b9e4f3709bc5 "c_h"
+  rebasing 16:4bc813530301 "c_e"
   switching to topic foobar
-  rebasing 18:4406ea4be852 "c_f" (tip foo)
+  rebasing 18:4406ea4be852 "c_f" (tip)
   switching to topic foo
   switching to topic foobar
   $ hg up
@@ -798,12 +798,12 @@
 get things linear again
 
   $ hg rebase -r t1 -d default
-  rebasing 16:1d84ec948370 "c_D" (tip blue)
+  rebasing 16:1d84ec948370 "c_D" (tip)
   switching to topic blue
   $ hg rebase -r t2 -d t1
-  rebasing 13:3ab2eedae500 "c_G" (blue)
+  rebasing 13:3ab2eedae500 "c_G"
   $ hg rebase -r t3 -d t2
-  rebasing 8:3bfe800e0486 "c_I" (blue)
+  rebasing 8:3bfe800e0486 "c_I"
   $ hg stack
   ### topic: blue
   ### target: default (branch)
--- a/tests/test-topic-tutorial.t	Fri Oct 20 15:31:06 2017 +0200
+++ b/tests/test-topic-tutorial.t	Fri Oct 20 17:30:20 2017 +0200
@@ -483,10 +483,10 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 1:13900241408b "adding condiments" (food)
+  rebasing 1:13900241408b "adding condiments"
   merging shopping
   switching to topic food
-  rebasing 2:287de11b401f "adding fruits" (food)
+  rebasing 2:287de11b401f "adding fruits"
   merging shopping
 
   $ hg log --graph
@@ -1034,12 +1034,12 @@
 #endif
 
   $ hg rebase
-  rebasing 6:183984ef46d1 "Adding hammer" (tools)
+  rebasing 6:183984ef46d1 "Adding hammer"
   merging shopping
   switching to topic tools
-  rebasing 7:cffff85af537 "Adding saw" (tools)
+  rebasing 7:cffff85af537 "Adding saw"
   merging shopping
-  rebasing 8:34255b455dac "Adding drill" (tools)
+  rebasing 8:34255b455dac "Adding drill"
   merging shopping
 
 But what about the other topic? You can use 'hg topics --verbose' to see
@@ -1066,10 +1066,10 @@
 multiple *public* heads it would create on that branch:
 
   $ hg rebase -b drinks
-  rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
+  rebasing 9:8dfa45bd5e0c "Adding apple juice"
   merging shopping
   switching to topic drinks
-  rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
+  rebasing 10:70dfa201ed73 "Adding orange juice"
   merging shopping
   switching to topic tools
 
@@ -1754,9 +1754,9 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 19:d5c51ee5762a "Adding saw" (tools)
+  rebasing 19:d5c51ee5762a "Adding saw"
   merging shopping
-  rebasing 20:bae3758e46bf "Adding drill" (tools)
+  rebasing 20:bae3758e46bf "Adding drill"
   merging shopping
 
   $ hg stack