diff tests/test-topic-stack.t @ 5647:c2fab88e6d60

tests: rebase now produces different "one-line summary" output CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 29 Oct 2020 09:19:37 -0700
parents 87966baf6ea9
children 1c1d8966ec55
line wrap: on
line diff
--- a/tests/test-topic-stack.t	Sat Oct 31 18:51:09 2020 +0100
+++ b/tests/test-topic-stack.t	Thu Oct 29 09:19:37 2020 -0700
@@ -410,8 +410,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 foo "c_e"
+  rebasing 5:6559e6d93aea foo "c_f"
   $ hg log -G
   o  8 default {foo} draft c_f
   |
@@ -480,8 +480,8 @@
   $ hg commit --amend -m 'c_D' 
   4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
-  rebasing 9:81264ae8a36a "c_g" (foo)
-  rebasing 10:fde5f5941642 "c_h" (foo)
+  rebasing 9:81264ae8a36a foo "c_g"
+  rebasing 10:fde5f5941642 foo "c_h"
   $ hg log -G
   o  13 default {foo} draft c_h
   |
@@ -546,8 +546,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 foo "c_e"
+  rebasing 8:ec9267b3f33f foo "c_f"
 
   $ hg log -G
   o  15 default {foo} draft c_f
@@ -593,17 +593,17 @@
   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 foo "c_f"
   switching to topic foo
   1 new orphan changesets
   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 foo "c_g"
   switching to topic foo
-  rebasing 13:b9e4f3709bc5 "c_h" (foo)
-  rebasing 16:4bc813530301 "c_e" (foobar)
+  rebasing 13:b9e4f3709bc5 foo "c_h"
+  rebasing 16:4bc813530301 foobar "c_e"
   switching to topic foobar
-  rebasing 18:4406ea4be852 "c_f" (tip foo)
+  rebasing 18:4406ea4be852 tip foo "c_f"
   switching to topic foo
   switching to topic foobar
   $ hg up
@@ -902,12 +902,12 @@
 get things linear again
 
   $ hg rebase -r s1 -d default
-  rebasing 16:1d84ec948370 "c_D" (tip blue)
+  rebasing 16:1d84ec948370 tip blue "c_D"
   switching to topic blue
   $ hg rebase -r s2 -d s1
-  rebasing 13:3ab2eedae500 "c_G" (blue)
+  rebasing 13:3ab2eedae500 blue "c_G"
   $ hg rebase -r s3 -d s2
-  rebasing 8:3bfe800e0486 "c_I" (blue)
+  rebasing 8:3bfe800e0486 blue "c_I"
   $ hg stack
   ### topic: blue
   ### target: default (branch)