178 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
178 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
179 for of, fl in diverge.iteritems(): |
179 for of, fl in diverge.iteritems(): |
180 act("divergent renames", "dr", of, fl) |
180 act("divergent renames", "dr", of, fl) |
181 |
181 |
182 repo.ui.note(_("resolving manifests\n")) |
182 repo.ui.note(_("resolving manifests\n")) |
183 repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial))) |
183 repo.ui.debug(" overwrite: %s, partial: %s\n" |
184 repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) |
184 % (bool(overwrite), bool(partial))) |
|
185 repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, p1, p2)) |
185 |
186 |
186 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() |
187 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() |
187 copied = set(copy.values()) |
188 copied = set(copy.values()) |
188 |
189 |
189 if '.hgsubstate' in m1: |
190 if '.hgsubstate' in m1: |