diff tests/test-evolve-stop-orphan.t @ 5828:0eacb0732195 mercurial-5.2

test-compat: merge mercurial-5.3 into mercurial-5.2

# no-check-commit

--- a/tests/test-evolve-stop-orphan.t	Sat Jan 30 20:53:45 2021 +0800
+++ b/tests/test-evolve-stop-orphan.t	Thu Mar 11 13:36:30 2021 +0800
@@ -153,7 +153,6 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at cb6a2ab625bb
 
   $ hg glog
   @  5:cb6a2ab625bb added c
@@ -258,15 +257,15 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at aec285328e90
+  working directory is now at 21817cd42526
 
 Only changeset which has a successor now are obsoleted
   $ hg glog
-  @  9:aec285328e90 added b
+  o  9:aec285328e90 added b
   |   () draft
   o  8:fd00db71edca added a
   |   () draft
-  o  7:21817cd42526 added hgignore
+  @  7:21817cd42526 added hgignore
       () draft
   *  6:2a4e03d422e2 added d
   |   () draft
@@ -303,11 +302,11 @@
   |   () draft
   o  10:cb1dd1086ef6 added c
   |   () draft
-  @  9:aec285328e90 added b
+  o  9:aec285328e90 added b
   |   () draft
   o  8:fd00db71edca added a
   |   () draft
-  o  7:21817cd42526 added hgignore
+  @  7:21817cd42526 added hgignore
       () draft
 
 Bookmarks should only be moved of the changesets which have been evolved,
@@ -315,7 +314,7 @@
 -------------------------------------------------------------------------
 
   $ hg up tip^
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bookmark b1
   $ hg up .^
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -367,13 +366,13 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at a3f4b95da934
+  working directory is now at a3cc2042492f
 
 Bookmarks of only the changeset which are evolved is moved
   $ hg glog
-  @  13:a3f4b95da934 added b
+  o  13:a3f4b95da934 added b
   |   (b2) draft
-  o  12:a3cc2042492f added a
+  @  12:a3cc2042492f added a
   |   () draft
   | *  11:cd0909a30222 added d
   | |   () draft