Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3710:91690473856c
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 | 9103dab96093 |
children | 6cb3aca69cdc |
line wrap: on
line diff
--- 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