Patchwork D6458: py3: fix test-convert-svn-sink.t

login
register
mail settings
Submitter phabricator
Date May 31, 2019, 1:15 p.m.
Message ID <e7b118b8cbe018fd14de08edfd992ee1@localhost.localdomain>
Download mbox | patch
Permalink /patch/40285/
State Not Applicable
Headers show

Comments

phabricator - May 31, 2019, 1:15 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc004340dc687: py3: fix test-convert-svn-sink.t (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6458?vs=15295&id=15309

REVISION DETAIL
  https://phab.mercurial-scm.org/D6458

AFFECTED FILES
  hgext/convert/subversion.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -1333,7 +1333,7 @@ 
                 rev = self.commit_re.search(output).group(1)
             except AttributeError:
                 if not files:
-                    return parents[0] if parents else None
+                    return parents[0] if parents else 'None'
                 self.ui.warn(_('unexpected svn output:\n'))
                 self.ui.warn(output)
                 raise error.Abort(_('unable to cope with svn output'))