164 |
164 |
165 if pa and not (backwards or overwrite): |
165 if pa and not (backwards or overwrite): |
166 if repo.ui.configbool("merge", "followcopies", True): |
166 if repo.ui.configbool("merge", "followcopies", True): |
167 dirs = repo.ui.configbool("merge", "followdirs", True) |
167 dirs = repo.ui.configbool("merge", "followdirs", True) |
168 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
168 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
169 copied = dict.fromkeys(copy.values()) |
169 copied = set(copy.values()) |
170 for of, fl in diverge.iteritems(): |
170 for of, fl in diverge.iteritems(): |
171 act("divergent renames", "dr", of, fl) |
171 act("divergent renames", "dr", of, fl) |
172 |
172 |
173 # Compare manifests |
173 # Compare manifests |
174 for f, n in m1.iteritems(): |
174 for f, n in m1.iteritems(): |