--- a/hgext/convert/subversion.py Thu Dec 01 15:57:10 2011 -0600
+++ b/hgext/convert/subversion.py Fri Dec 02 17:38:07 2011 +0100
@@ -1116,6 +1116,12 @@
return u"svn:%s@%s" % (self.uuid, rev)
def putcommit(self, files, copies, parents, commit, source, revmap):
+ for parent in parents:
+ try:
+ return self.revid(self.childmap[parent])
+ except KeyError:
+ pass
+
# Apply changes to working copy
for f, v in files:
try:
@@ -1128,11 +1134,6 @@
self.copies.append([copies[f], f])
files = [f[0] for f in files]
- for parent in parents:
- try:
- return self.revid(self.childmap[parent])
- except KeyError:
- pass
entries = set(self.delete)
files = frozenset(files)
entries.update(self.add_dirs(files.difference(entries)))