Mercurial > hgsubversion

changeset 640:a3d20d6e96b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: handle branch mapping.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Tue, 13 Jul 2010 13:18:11 +0200
parents b2c8c2079822
children 67513cca972f
files hgsubversion/stupid.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -640,6 +640,7 @@ def convert_rev(ui, meta, svn, r, tbdelt
             extra.update({'branch': parentctx.extra().get('branch', None),
                           'close': 1})
 
+        origbranch = extra.get('branch', None)
         meta.mapbranch(extra)
         current_ctx = context.memctx(meta.repo,
                                      [parentctx.node(), revlog.nullid],
@@ -651,11 +652,10 @@ def convert_rev(ui, meta, svn, r, tbdelt
                                      extra)
         ha = meta.repo.commitctx(current_ctx)
 
-        branch = extra.get('branch', None)
         if not tag:
-            if (not branch in meta.branches
-                and not meta.get_path_tag(meta.remotename(branch))):
-                meta.branches[branch] = None, 0, r.revnum
+            if (not origbranch in meta.branches
+                and not meta.get_path_tag(meta.remotename(origbranch))):
+                meta.branches[origbranch] = None, 0, r.revnum
             meta.revmap[r.revnum, b] = ha
         else:
             meta.movetag(tag, ha, r, date)