equal
deleted
inserted
replaced
193 |
193 |
194 def act(msg, m, f, *args): |
194 def act(msg, m, f, *args): |
195 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
195 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
196 action.append((f, m) + args) |
196 action.append((f, m) + args) |
197 |
197 |
198 if not (backwards or overwrite): |
198 if pa and not (backwards or overwrite): |
199 copy = findcopies(repo, m1, m2, ma, pa.rev()) |
199 copy = findcopies(repo, m1, m2, ma, pa.rev()) |
200 |
200 |
201 # Compare manifests |
201 # Compare manifests |
202 for f, n in m1.iteritems(): |
202 for f, n in m1.iteritems(): |
203 if partial and not partial(f): |
203 if partial and not partial(f): |