Skip to content
Snippets Groups Projects
Commit 78ab0f85e249 authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

rebase: improve error message for more than one external parent

parent 2160c2e0d7d1
No related branches found
No related tags found
No related merge requests found
...@@ -406,8 +406,10 @@ ...@@ -406,8 +406,10 @@
return nullrev return nullrev
if len(parents) == 1: if len(parents) == 1:
return parents.pop() return parents.pop()
raise util.Abort(_('unable to collapse, there is more ' raise util.Abort(_('unable to collapse on top of %s, there is more '
'than one external parent')) 'than one external parent: %s') %
(max(targetancestors),
', '.join(str(p) for p in sorted(parents))))
def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None): def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None):
'Commit the changes and store useful information in extra' 'Commit the changes and store useful information in extra'
......
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
$ cd b1 $ cd b1
$ hg rebase -s 2 --collapse $ hg rebase -s 2 --collapse
abort: unable to collapse, there is more than one external parent abort: unable to collapse on top of 7, there is more than one external parent: 1, 5
[255] [255]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
......
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