99 def act(msg, m, f, *args): |
99 def act(msg, m, f, *args): |
100 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
100 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
101 action.append((f, m) + args) |
101 action.append((f, m) + args) |
102 |
102 |
103 if pa and not (backwards or overwrite): |
103 if pa and not (backwards or overwrite): |
104 copy, diverge = copies.copies(repo, p1, p2, pa) |
104 if repo.ui.configbool("merge", "followcopies", True): |
|
105 dirs = repo.ui.configbool("merge", "followdirs", True) |
|
106 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
105 copied = dict.fromkeys(copy.values()) |
107 copied = dict.fromkeys(copy.values()) |
106 for of, fl in diverge.items(): |
108 for of, fl in diverge.items(): |
107 act("divergent renames", "dr", of, fl) |
109 act("divergent renames", "dr", of, fl) |
108 |
110 |
109 # Compare manifests |
111 # Compare manifests |