equal
deleted
inserted
replaced
123 |
123 |
124 if not repo.ui.configbool("merge", "followcopies", True): |
124 if not repo.ui.configbool("merge", "followcopies", True): |
125 return {} |
125 return {} |
126 |
126 |
127 # avoid silly behavior for update from empty dir |
127 # avoid silly behavior for update from empty dir |
128 if not m1: |
128 if not m1 or not m2 or not ma: |
129 return {} |
129 return {} |
130 |
130 |
131 dcopies = repo.dirstate.copies() |
131 dcopies = repo.dirstate.copies() |
132 copy = {} |
132 copy = {} |
133 u1 = nonoverlap(m1, m2, ma) |
133 u1 = nonoverlap(m1, m2, ma) |
186 |
186 |
187 def act(msg, m, f, *args): |
187 def act(msg, m, f, *args): |
188 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
188 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
189 action.append((f, m) + args) |
189 action.append((f, m) + args) |
190 |
190 |
191 if pa and not (backwards or overwrite): |
191 if not (backwards or overwrite): |
192 copy = findcopies(repo, m1, m2, ma, pa.rev()) |
192 copy = findcopies(repo, m1, m2, ma, pa.rev()) |
193 copied = dict.fromkeys(copy.values()) |
193 copied = dict.fromkeys(copy.values()) |
194 |
194 |
195 # Compare manifests |
195 # Compare manifests |
196 for f, n in m1.iteritems(): |
196 for f, n in m1.iteritems(): |