Mercurial > hgsubversion

diff hgsubversion/hg_delta_editor.py @ 352:cc7a10efddc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a bug in branch ancestry calculation.
author Augie Fackler <durin42@gmail.com>
date Fri, 22 May 2009 23:38:01 -0500
parents b6f9e270f103
children 705f33c0a323
line wrap: on
line diff
--- 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: