Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

1 files changed, 14 insertions, 20 deletions

diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
index 9d0a156..2ee4bdd 100644
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -3,11 +3,8 @@
   > graphlog=
   > rebase=
   > 
-  > [phases]
-  > publish=False
-  > 
   > [alias]
-  > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
+  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
   > EOF
 
   $ hg init a
@@ -37,20 +34,18 @@
   $ hg add extra2
   $ hg ci -m L3
 
-  $ hg phase --force --secret 4
-
   $ hg tglog
-  @  5:secret 'L3'
+  @  5: 'L3'
   |
-  o  4:secret 'L2'
+  o  4: 'L2'
   |
-  o  3:draft 'L1'
+  o  3: 'L1'
   |
-  | o  2:draft 'C3'
+  | o  2: 'C3'
   |/
-  o  1:draft 'C2'
+  o  1: 'C2'
   |
-  o  0:draft 'C1'
+  o  0: 'C1'
   
 Try to call --continue:
 
@@ -63,7 +58,7 @@ Conflicting rebase:
   $ hg rebase -s 3 -d 2
   merging common
   warning: conflicts during merge.
-  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging common failed!
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
@@ -81,17 +76,17 @@ Conclude rebase:
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
-  @  5:secret 'L3'
+  @  5: 'L3'
   |
-  o  4:secret 'L2'
+  o  4: 'L2'
   |
-  o  3:draft 'L1'
+  o  3: 'L1'
   |
-  o  2:draft 'C3'
+  o  2: 'C3'
   |
-  o  1:draft 'C2'
+  o  1: 'C2'
   |
-  o  0:draft 'C1'
+  o  0: 'C1'
   
 Check correctness:
 
@@ -118,4 +113,3 @@ Check correctness:
   $ hg cat -r 5 common
   resolved merge
 
-  $ cd ..