diff tests/test-evolve-continue.t @ 6064:28a77df6e41f mercurial-5.7

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

# no-check-commit

--- a/tests/test-evolve-continue.t	Thu Aug 12 22:00:46 2021 +0200
+++ b/tests/test-evolve-continue.t	Tue Oct 12 11:15:44 2021 +0300
@@ -1,14 +1,14 @@
 Testing the continue functionality of `hg evolve`
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = True
-  > [alias]
-  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
   > [extensions]
   > rebase =
+  > evolve =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 #testcases inmemory ondisk
 #if inmemory
@@ -51,7 +51,7 @@
   @  5:cb6a2ab625bb added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -111,7 +111,7 @@
   @  8:00a5c774cc37 added d
   |   () draft
   | *  7:ad0a59d83efe added e
-  | |   () draft
+  | |   () draft orphan
   | x  6:2a4e03d422e2 added d
   |/    () draft
   o  5:cb6a2ab625bb added c
@@ -235,13 +235,13 @@
   @  16:645135c5caa4 added c
   |   () draft
   | *  15:09becba8f97d added h
-  | |   () draft
+  | |   () draft orphan
   | *  14:5aa7b2bbd944 added g
-  | |   () draft
+  | |   () draft orphan
   | *  13:be88f889b6dc added f
-  | |   () draft
+  | |   () draft orphan
   | *  12:6642d2c9176e added d
-  | |   () draft
+  | |   () draft orphan
   | x  11:95665a2de664 added c
   |/    () draft
   o  10:87f748868183 added b
@@ -473,7 +473,7 @@
   $ echo 2b > a
   $ hg amend -q
   1 new orphan changesets
-  $ hg ev -q
+  $ hg evolve -q
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')