Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: Don't search for copies across unrelated manifests
authorBrendan Cully <brendan@kublai.com>
Thu, 23 Nov 2006 22:45:00 -0800
changeset 3710 91690473856c
parent 3709 38291d9c8c1c
child 3711 9ccc6be9ae4d
merge: Don't search for copies across unrelated manifests
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -195,7 +195,7 @@ def manifestmerge(repo, p1, p2, pa, over
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
-    if not (backwards or overwrite):
+    if pa and not (backwards or overwrite):
         copy = findcopies(repo, m1, m2, ma, pa.rev())
 
     # Compare manifests
mercurial-crew-with-dirclash