# HG changeset patch # User Augie Fackler # Date 1243709073 18000 # Node ID 639105d25a2f8e2b28d2209e93c557184f04be60 # Parent e1b23a6ca09316e472678fb8d893da25eaaf2f19 tags: Fix parent detection so that copyfrom trunk@5 correctly falls back to trunk@4 if trunk@5 is not in the revmap. diff --git a/hgsubversion/hg_delta_editor.py b/hgsubversion/hg_delta_editor.py --- 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)