# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1243053481 18000
# Node ID cc7a10efddc95a4f2b32a42cde68a0ff373c22d5
# Parent  3d5c4352a6c89a9670e766ff8c4baa568b2dca0c
Fix a bug in branch ancestry calculation.

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
@@ -561,7 +561,9 @@ class HgChangeReceiver(delta.Editor):
                 p, paths[p].copyfrom_path, paths[p].copyfrom_rev, revision.revnum)
             if not parent and paths[p].copyfrom_path:
                 bpath, branch = self._path_and_branch_for_path(p, False)
-                if bpath is not None and branch not in self.branches:
+                if (bpath is not None
+                    and branch not in self.branches
+                    and branch not in added_branches):
                     parent = {branch: (None, 0, revision.revnum)}
             added_branches.update(parent)
         for t in tags_to_delete: