Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3709:38291d9c8c1c | 3710:91690473856c |
|---|---|
| 193 | 193 |
| 194 def act(msg, m, f, *args): | 194 def act(msg, m, f, *args): |
| 195 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) | 195 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
| 196 action.append((f, m) + args) | 196 action.append((f, m) + args) |
| 197 | 197 |
| 198 if not (backwards or overwrite): | 198 if pa and not (backwards or overwrite): |
| 199 copy = findcopies(repo, m1, m2, ma, pa.rev()) | 199 copy = findcopies(repo, m1, m2, ma, pa.rev()) |
| 200 | 200 |
| 201 # Compare manifests | 201 # Compare manifests |
| 202 for f, n in m1.iteritems(): | 202 for f, n in m1.iteritems(): |
| 203 if partial and not partial(f): | 203 if partial and not partial(f): |