# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1164929793 21600
# Node ID b4af5f92e04b790a4b15fc6070147fe2e098307f
# Parent  d377f8d256625a67fd09a8aef4d56bd1266152f7
merge: move check for empty ancestor into findcopies

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -125,7 +125,7 @@ def findcopies(repo, m1, m2, ma, limit):
         return {}
 
     # avoid silly behavior for update from empty dir
-    if not m1:
+    if not m1 or not m2 or not ma:
         return {}
 
     dcopies = repo.dirstate.copies()
@@ -188,7 +188,7 @@ def manifestmerge(repo, p1, p2, pa, over
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
-    if pa and not (backwards or overwrite):
+    if not (backwards or overwrite):
         copy = findcopies(repo, m1, m2, ma, pa.rev())
     copied = dict.fromkeys(copy.values())