# HG changeset patch # User Dirkjan Ochtman # Date 1286371085 -7200 # Node ID 8d36054b04ed36ae4d80da8cc8b633e68429209a # Parent c787147fa3b72ff366dd3781bf86ab82053e5f11 keep variables more local, add some whitespace diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py --- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -621,13 +621,16 @@ class SVNMeta(object): branches.setdefault(branch, []).append((op, tag, srcrev)) for b, tags in branches.iteritems(): - fromtag = self.get_path_tag(self.remotename(b)) + # modify parent's .hgtags source + parent = self.repo[self.get_parent_revision(rev.revnum, b)] if '.hgtags' not in parent: src = '' else: src = parent['.hgtags'].data() + + fromtag = self.get_path_tag(self.remotename(b)) for op, tag, r in sorted(tags, reverse=True): if op == 'add': if fromtag: