diff tests/test-topic-stack-complex.t @ 4516:f54bb6eaf5e6 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

--- a/tests/test-topic-stack-complex.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-topic-stack-complex.t	Thu Apr 11 22:44:53 2019 +0200
@@ -81,7 +81,6 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] c
-  1 new orphan changesets
 
   $ hg stack
   ### topic: foo
@@ -95,7 +94,7 @@
   $ hg show work
   @  5cce (foo) split2
   o  f26c (foo) split1
-  | *  f1d3 (foo) Added e and f
+  | o  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
@@ -114,13 +113,12 @@
   +foo
 
   $ hg amend
-  1 new orphan changesets
   $ hg show work
   @  7d94 (foo) split1
-  | *  5cce (foo) split2
+  | o  5cce (foo) split2
   | x  f26c (foo) split1
   |/
-  | *  f1d3 (foo) Added e and f
+  | o  f1d3 (foo) Added e and f
   | x  8e82 (foo) Added c and d
   |/
   o  002b (foo) Added a and b
@@ -148,14 +146,10 @@
   $ hg id -r .
   ec94a1ed1330 tip
   $ hg up --hidden 'min(precursors(.))'
-  updating to a hidden changeset f1d3649d6a8b
-  (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (f1d3649d6a8b)
   (use 'hg evolve' to update to its successor: ec94a1ed1330)
   $ hg amend -d '0 1'
-  1 new orphan changesets
-  2 new content-divergent changesets
   $ hg rebase -r . -d ec94a1ed1330~1
   rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
   $ hg stack