diff hgsubversion/stupid.py @ 452:ae35c389cdef

tags: allow editing tags of closed branches without reopening the branch
author Augie Fackler <durin42@gmail.com>
date Fri, 26 Jun 2009 14:53:58 -0500
parents 0d3b5acb1d51
children ba65e97538d1
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -624,14 +624,15 @@ def convert_rev(ui, meta, svn, r, tbdelt
         ha = meta.repo.commitctx(current_ctx)
 
         branch = extra.get('branch', None)
-        if (not branch in meta.branches
-            and not meta.is_path_tag(meta.remotename(branch))):
-            meta.branches[branch] = None, 0, r.revnum
         if not tag:
+            if (not branch in meta.branches
+                and not meta.is_path_tag(meta.remotename(branch))):
+                print tag, 'madebranch', branch
+                meta.branches[branch] = None, 0, r.revnum
             meta.revmap[r.revnum, b] = ha
-        util.describe_commit(ui, ha, b)
-        if tag:
+        else:
             meta.movetag(tag, ha, parentctx.extra().get('branch', None), r, date)
+        util.describe_commit(ui, ha, b)
 
     # These are branches with an 'R' status in svn log. This means they were
     # replaced by some other branch, so we need to verify they get marked as closed.