Mercurial > hg

diff hgext/convert/subversion.py @ 10051:a02d43acbc04 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>
author Patrick Mezard <pmezard@gmail.com>
date Mon, 07 Dec 2009 12:44:15 -0500
parents 9c43089b372a
children 661980567246
line wrap: on
line diff
--- a/hgext/convert/subversion.py	Fri Dec 11 15:09:52 2009 +0900
+++ b/hgext/convert/subversion.py	Mon Dec 07 12:44:15 2009 -0500
@@ -1138,6 +1138,8 @@
             try:
                 rev = self.commit_re.search(output).group(1)
             except AttributeError:
+                if not files:
+                    return parents[0]
                 self.ui.warn(_('unexpected svn output:\n'))
                 self.ui.warn(output)
                 raise util.Abort(_('unable to cope with svn output'))