diff tests/test-topic-dest.t @ 3102:6604d96fc73c mercurial-4.3

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 ccfcacc5ee7c
children 537fd9a86c06
line wrap: on
line diff
--- 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