Mercurial > hgsubversion

changeset 380:639105d25a2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tags: Fix parent detection so that copyfrom trunk@5 correctly falls back to trunk@4 if trunk@5 is not in the revmap.
author Augie Fackler <durin42@gmail.com>
date Sat, 30 May 2009 13:44:33 -0500
parents e1b23a6ca093
children a441ba143ac8
files hgsubversion/hg_delta_editor.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/hg_delta_editor.py
+++ b/hgsubversion/hg_delta_editor.py
@@ -575,7 +575,8 @@ class HgChangeReceiver(delta.Editor):
                 src = parent['.hgtags'].data()
             for op, tag, r in sorted(tags, reverse=True):
                 if op == 'add':
-                    tagged = node.hex(self.revmap[r, b])
+                    tagged = node.hex(self.revmap[
+                        self.get_parent_svn_branch_and_rev(r+1, b)])
                 elif op == 'rm':
                     tagged = node.hex(node.nullid)
                 src += '%s %s\n' % (tagged, tag)