Mercurial > hg

changeset 3710:91690473856c

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
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Nov 2006 22:45:00 -0800
parents 38291d9c8c1c
children 9ccc6be9ae4d
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Nov 22 00:53:56 2006 +0200
+++ b/mercurial/merge.py	Thu Nov 23 22:45:00 2006 -0800
@@ -195,7 +195,7 @@
         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