Skip to content
Snippets Groups Projects
Commit b19b4c1df066 authored by Steve Borho's avatar Steve Borho
Browse files

rebase: improve resolve failure message

parent 53cfde2b3cf9
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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
......
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment