Mercurial > hg

changeset 24856:5c1364b7e5ac stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: avoid traceback in subversion sink We've had a couple reports of subversion tracebacks that trigger when the parents list is empty, and thus block showing what the commit failure was on the next two lines.
author Matt Mackall <mpm@selenic.com>
date Mon, 27 Apr 2015 11:11:26 -0500
parents 8015a3cf1380
children d8505bfe4825
files hgext/convert/subversion.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Fri Apr 24 15:29:02 2015 -0500
+++ b/hgext/convert/subversion.py	Mon Apr 27 11:11:26 2015 -0500
@@ -1293,7 +1293,7 @@
             try:
                 rev = self.commit_re.search(output).group(1)
             except AttributeError:
-                if not files:
+                if parents and not files:
                     return parents[0]
                 self.ui.warn(_('unexpected svn output:\n'))
                 self.ui.warn(output)