# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1244619032 -7200
# Node ID f13dd964d10c7c46e06aced7fd0af535baa36815
# Parent  1b9d004a8c0ad31a7bf8beb0df8901a0164b0335
tags: obey usebranchnames setting

diff --git a/hgsubversion/hg_delta_editor.py b/hgsubversion/hg_delta_editor.py
--- a/hgsubversion/hg_delta_editor.py
+++ b/hgsubversion/hg_delta_editor.py
@@ -582,6 +582,8 @@ class HgChangeReceiver(delta.Editor):
                                           islink=False, isexec=False,
                                           copied=None)
             extra = util.build_extra(rev.revnum, b, self.uuid, self.subdir)
+            if not self.usebranchnames:
+                extra.pop('branch', None)
             ctx = context.memctx(self.repo,
                                  (parent.node(), node.nullid),
                                  rev.message or ' ',