# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1159304647 18000
# Node ID 84561ea8711ec405ddf84231fb7a3bedd0ea40a7
# Parent  1839e6e91c3ae2e4f5366e2ebe14e4152352ef2e
merge: move findcopies after workingmanifest

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -360,10 +360,7 @@ def update(repo, node, branchmerge=False
                   (short(p1), short(p2), short(pa)))
 
     action = []
-
     copy = {}
-    if not (backwards or overwrite):
-        copy = findcopies(repo, m1, m2, repo.changelog.rev(pa))
 
     m1 = workingmanifest(repo, m1, status)
 
@@ -371,6 +368,8 @@ def update(repo, node, branchmerge=False
         checkunknown(repo, m2, status)
     if not branchmerge:
         action += forgetremoved(m2, status)
+    if not (backwards or overwrite):
+        copy = findcopies(repo, m1, m2, repo.changelog.rev(pa))
 
     action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial)
     del m1, m2, ma