Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve resolve failure message stable
authorSteve Borho <steve@borho.org>
Sat, 30 Oct 2010 16:58:15 -0500
branchstable
changeset 12896 b19b4c1df066
parent 12895 53cfde2b3cf9
child 12897 81cdf836457e
rebase: improve resolve failure message
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-abort.t file | annotate | diff | comparison | revisions
tests/test-rebase-check-restore.t file | annotate | diff | comparison | revisions
tests/test-rebase-conflicts.t file | annotate | diff | comparison | revisions
tests/test-rebase-interruptions.t file | annotate | diff | comparison | revisions
tests/test-rebase-mq-skip.t file | annotate | diff | comparison | revisions
tests/test-rebase-mq.t file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Mon Nov 01 10:24:07 2010 +0100
+++ b/hgext/rebase.py	Sat Oct 30 16:58:15 2010 -0500
@@ -165,8 +165,8 @@
                 else:
                     stats = rebasenode(repo, rev, p1, p2, state)
                     if stats and stats[3] > 0:
-                        raise util.Abort(_('fix unresolved conflicts with hg '
-                                    'resolve then run hg rebase --continue'))
+                        raise util.Abort(_('unresolved conflicts (see hg '
+                                    'resolve, then hg rebase --continue)'))
                 updatedirstate(repo, rev, target, p2)
                 if not collapsef:
                     newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
--- a/tests/test-rebase-abort.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-abort.t	Sat Oct 30 16:58:15 2010 -0500
@@ -50,7 +50,7 @@
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Abort:
@@ -118,7 +118,7 @@
   merging c
   warning: conflicts during merge.
   merging c failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ hg tglog
--- a/tests/test-rebase-check-restore.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-check-restore.t	Sat Oct 30 16:58:15 2010 -0500
@@ -64,7 +64,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -116,7 +116,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
--- a/tests/test-rebase-conflicts.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-conflicts.t	Sat Oct 30 16:58:15 2010 -0500
@@ -59,7 +59,7 @@
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Try to continue without solving the conflict:
--- a/tests/test-rebase-interruptions.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-interruptions.t	Sat Oct 30 16:58:15 2010 -0500
@@ -57,7 +57,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on C during the interruption:
@@ -89,7 +89,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -143,7 +143,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on B' during the interruption:
--- a/tests/test-rebase-mq-skip.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-mq-skip.t	Sat Oct 30 16:58:15 2010 -0500
@@ -105,7 +105,7 @@
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ HGMERGE=internal:local hg resolve --all
--- a/tests/test-rebase-mq.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-mq.t	Sat Oct 30 16:58:15 2010 -0500
@@ -63,7 +63,7 @@
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 1st conflict:
@@ -74,7 +74,7 @@
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 2nd conflict:
hg-stable