# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1382542933 -28800
# Node ID 78ab0f85e249ef040e6933f8641dabbaee27c05a
# Parent  2160c2e0d7d1984fdbd1b89c2d6c2e2ff666598b
rebase: improve error message for more than one external parent

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'
diff -r 2160c2e0d7d1 -r 78ab0f85e249 tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t	Thu Oct 24 12:05:22 2013 +0800
+++ b/tests/test-rebase-collapse.t	Wed Oct 23 23:42:13 2013 +0800
@@ -226,7 +226,7 @@
   $ cd b1
 
   $ 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]
 
 Rebase and collapse - E onto H: