diff tests/test-topic-stack.t @ 6585:a62308fb15c1 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6

--- a/tests/test-topic-stack.t	Sat Oct 14 13:15:16 2023 -0300
+++ b/tests/test-topic-stack.t	Sat Oct 14 13:34:03 2023 -0300
@@ -379,11 +379,11 @@
 
   $ hg log -r 'stack(foo)'
   hg: parse error: stack takes no arguments, it works on current topic
-  [10]
+  [255]
 
   $ hg log -r 'stack(foobar)'
   hg: parse error: stack takes no arguments, it works on current topic
-  [10]
+  [255]
 
 Stack relation:
 
@@ -410,8 +410,8 @@
 Make things linear again
 
   $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
-  rebasing 4:0f9ac936c87d foo "c_e"
-  rebasing 5:6559e6d93aea foo "c_f"
+  rebasing 4:0f9ac936c87d "c_e" (foo)
+  rebasing 5:6559e6d93aea "c_f" (foo)
   $ 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 foo "c_g"
-  rebasing 10:fde5f5941642 foo "c_h"
+  rebasing 9:81264ae8a36a "c_g" (foo)
+  rebasing 10:fde5f5941642 "c_h" (foo)
   $ 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 foo "c_e"
-  rebasing 8:ec9267b3f33f foo "c_f"
+  rebasing 7:215bc359096a "c_e" (foo)
+  rebasing 8:ec9267b3f33f "c_f" (foo)
 
   $ 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 foo "c_f"
+  rebasing 15:77082e55de88 "c_f" (foo)
   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 foo "c_g"
+  rebasing 12:0c3e8aed985d "c_g" (foo)
   switching to topic foo
-  rebasing 13:b9e4f3709bc5 foo "c_h"
-  rebasing 16:4bc813530301 foobar "c_e"
+  rebasing 13:b9e4f3709bc5 "c_h" (foo)
+  rebasing 16:4bc813530301 "c_e" (foobar)
   switching to topic foobar
-  rebasing 18:4406ea4be852 tip foo "c_f"
+  rebasing 18:4406ea4be852 "c_f" (tip foo)
   switching to topic foo
   switching to topic foobar
   $ hg up
@@ -907,13 +907,13 @@
 get things linear again
 
   $ hg rebase -r s1 -d default
-  rebasing 16:c9b07601c2f4 tip blue "c_D"
+  rebasing 16:c9b07601c2f4 "c_D" (tip blue)
   switching to topic-namespace my-tns
   switching to topic blue
   $ hg rebase -r s2 -d s1
-  rebasing 13:90c34d9f99aa blue "c_G"
+  rebasing 13:90c34d9f99aa "c_G" (blue)
   $ hg rebase -r s3 -d s2
-  rebasing 8:77174443ad61 blue "c_I"
+  rebasing 8:77174443ad61 "c_I" (blue)
   $ hg stack
   ### topic: blue
   ### target: default (branch)