Mercurial > hg-stable
changeset 4798:83c1bbb934ec
convert: svn merges produce hard-to-trace file entries. Ignore them for now.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 03 Jul 2007 19:49:36 -0700 |
| parents | 09dae950919f |
| children | d00ca99bc54e |
| files | hgext/convert/subversion.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Tue Jul 03 19:26:41 2007 -0700 +++ b/hgext/convert/subversion.py Tue Jul 03 19:49:36 2007 -0700 @@ -313,7 +313,7 @@ fromkind = svn.ra.check_path(self.ra, entrypath, fromrev) if fromkind == svn.core.svn_node_file: # a deleted file entries.append(self.recode(entry)) - else: + elif fromkind == svn.core.svn_node_dir: # print "Deleted/moved non-file:", revnum, path, ent # children = self._find_children(path, revnum - 1) # print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action) @@ -343,6 +343,9 @@ del copies[entry] else: entries.append(entry) + else: + self.ui.debug('unknown path in revision %d: %s\n' % \ + (revnum, path)) elif kind == svn.core.svn_node_dir: # Should probably synthesize normal file entries # and handle as above to clean up copy/rename handling.