# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1246846393 18000
# Node ID 8ad6dfd51f72367fc51fbc2a5c28799fa46bea6a
# Parent  b5b4095d29935f5129cacfc252cea2a37377e444# Parent  29fe7212cae0a7d9418f5717ccd154a449750d63
Merge with mpedersen.

diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py
--- 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)])