128 repo.ui.note(_("resolving manifests\n")) |
128 repo.ui.note(_("resolving manifests\n")) |
129 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial))) |
129 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial))) |
130 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2)) |
130 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2)) |
131 |
131 |
132 action = [] |
132 action = [] |
133 copy, copied, diverge = {}, {}, {} |
133 copy, copied = {}, {} |
134 m1 = p1.manifest() |
134 m1 = p1.manifest() |
135 m2 = p2.manifest() |
135 m2 = p2.manifest() |
136 |
136 |
137 def fmerge(f, f2, fa): |
137 def fmerge(f, f2, fa): |
138 """merge flags""" |
138 """merge flags""" |
162 else: |
162 else: |
163 ma = pa.manifest() |
163 ma = pa.manifest() |
164 if pa and repo.ui.configbool("merge", "followcopies", True): |
164 if pa and repo.ui.configbool("merge", "followcopies", True): |
165 dirs = repo.ui.configbool("merge", "followdirs", True) |
165 dirs = repo.ui.configbool("merge", "followdirs", True) |
166 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
166 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
167 copied = set(copy.values()) |
167 for of, fl in diverge.iteritems(): |
168 for of, fl in diverge.iteritems(): |
168 act("divergent renames", "dr", of, fl) |
169 act("divergent renames", "dr", of, fl) |
169 copied = set(copy.values()) |
170 |
170 |
171 # Compare manifests |
171 # Compare manifests |
172 for f, n in m1.iteritems(): |
172 for f, n in m1.iteritems(): |
173 if partial and not partial(f): |
173 if partial and not partial(f): |
174 continue |
174 continue |