diff -r 2160c2e0d7d1 -r 78ab0f85e249 hgext/rebase.py --- a/hgext/rebase.py Thu Oct 24 12:05:22 2013 +0800 +++ b/hgext/rebase.py Wed Oct 23 23:42:13 2013 +0800 @@ -406,8 +406,10 @@ return nullrev if len(parents) == 1: return parents.pop() - raise util.Abort(_('unable to collapse, there is more ' - 'than one external parent')) + raise util.Abort(_('unable to collapse on top of %s, there is more ' + '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): 'Commit the changes and store useful information in extra'