# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1164350700 28800
# Node ID 91690473856c4bc7a2417abaf66f43372432818c
# Parent  38291d9c8c1c4f02f70d0bcce5df8f1d05956fb9
merge: Don't search for copies across unrelated manifests

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- 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