Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3728:a32b4b930079
merge: remove unused match logic from findcopies
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 17:36:33 -0600 |
parents | 0fb66912040a |
children | 581d20773326 |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -130,7 +130,6 @@ def findcopies(repo, m1, m2, ma, limit): dcopies = repo.dirstate.copies() copy = {} - match = {} u1 = nonoverlap(m1, m2, ma) u2 = nonoverlap(m2, m1, ma) ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20])) @@ -150,17 +149,12 @@ def findcopies(repo, m1, m2, ma, limit): for of in findold(c, limit): if of in m2: checkpair(c, of, m2) - else: - match.setdefault(of, []).append(f) for f in u2: c = ctx(f, m2[f]) for of in findold(c, limit): if of in m1: checkpair(c, of, m1) - elif of in match: - for mf in match[of]: - checkpair(c, mf, m1) return copy