Mercurial > hg-stable

diff tests/test-rebase-interruptions.t @ 18933:42b620fc89e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:27:59 -0600
parents f8af57c00a29
children e5d9441ec281
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-interruptions.t	Fri Feb 08 16:27:59 2013 -0600
@@ -61,7 +61,7 @@
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on C during the interruption:
@@ -97,7 +97,7 @@
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -151,7 +151,7 @@
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on B' during the interruption:
@@ -222,7 +222,7 @@
   merging A
   warning: conflicts during merge.
   merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Change phase on B and B'