# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1238281195 18000
# Node ID ced45b753ba70fb60d85b385da2db07dc6db89f5
# Parent  06eb60f9a0265b501384053cc9e13216be91bccc
util: better error messages when finding svn parent of a revision.

diff --git a/util.py b/util.py
--- a/util.py
+++ b/util.py
@@ -3,6 +3,7 @@ import shutil
 
 from mercurial import hg
 from mercurial import node
+from mercurial import util
 
 svn_subcommands = { }
 def register_subcommand(name):
@@ -94,7 +95,8 @@ def outgoing_revisions(ui, repo, hg_edit
            and sourcerev.node() != node.nullid):
         outgoing_rev_hashes.append(sourcerev.node())
         sourcerev = sourcerev.parents()
-        assert len(sourcerev) == 1
+        if len(sourcerev) != 1:
+            raise util.Abort("Sorry, can't find svn parent of a merge revision.")
         sourcerev = sourcerev[0]
     if sourcerev.node() != node.nullid:
         return outgoing_rev_hashes