Mercurial > hgsubversion

changeset 457:8ad6dfd51f72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpedersen.
author Augie Fackler <durin42@gmail.com>
date Sun, 05 Jul 2009 21:13:13 -0500
parents b5b4095d2993 (diff) 29fe7212cae0 (current diff)
children 974102998578
files hgsubversion/svnmeta.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
@@ -351,8 +351,7 @@ class SVNMeta(object):
                         added_tags[t_name] = branch, src_rev
                     elif file:
                         t_name = t_name[:-(len(file)+1)]
-                        if (t_name in added_tags
-                            and src_rev > added_tags[t_name][1]):
+                        if t_name in added_tags and src_rev > added_tags[t_name][1]:
                             added_tags[t_name] = branch, src_rev
                 elif (paths[p].action == 'D' and p.endswith(t_name)
                       and t_name in self.tags):
@@ -483,7 +482,8 @@ class SVNMeta(object):
             for op, tag, r in sorted(tags, reverse=True):
                 if op == 'add':
                     if fromtag:
-                        tagged = node.hex(self.tags[fromtag])
+                        if fromtag in self.tags:
+                            tagged = node.hex(self.tags[fromtag])
                     else:
                         tagged = node.hex(self.revmap[
                             self.get_parent_svn_branch_and_rev(r+1, b)])