Show More
@@ -174,7 +174,7 b' def pathcopies(x, y):' | |||||
174 | return _backwardcopies(x, y) |
|
174 | return _backwardcopies(x, y) | |
175 | return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y)) |
|
175 | return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y)) | |
176 |
|
176 | |||
177 |
def mergecopies(repo, c1, c2, ca |
|
177 | def mergecopies(repo, c1, c2, ca): | |
178 | """ |
|
178 | """ | |
179 | Find moves and copies between context c1 and c2 that are relevant |
|
179 | Find moves and copies between context c1 and c2 that are relevant | |
180 | for merging. |
|
180 | for merging. | |
@@ -310,7 +310,7 b' def mergecopies(repo, c1, c2, ca, checkd' | |||||
310 | repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) |
|
310 | repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) | |
311 | del diverge2 |
|
311 | del diverge2 | |
312 |
|
312 | |||
313 |
if not fullcopy |
|
313 | if not fullcopy: | |
314 | return copy, diverge |
|
314 | return copy, diverge | |
315 |
|
315 | |||
316 | repo.ui.debug(" checking for directory renames\n") |
|
316 | repo.ui.debug(" checking for directory renames\n") |
@@ -188,8 +188,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
188 | elif pa == p2: # backwards |
|
188 | elif pa == p2: # backwards | |
189 | pa = p1.p1() |
|
189 | pa = p1.p1() | |
190 | elif pa and repo.ui.configbool("merge", "followcopies", True): |
|
190 | elif pa and repo.ui.configbool("merge", "followcopies", True): | |
191 | dirs = repo.ui.configbool("merge", "followdirs", True) |
|
191 | copy, diverge = copies.mergecopies(repo, p1, p2, pa) | |
192 | copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs) |
|
|||
193 | for of, fl in diverge.iteritems(): |
|
192 | for of, fl in diverge.iteritems(): | |
194 | act("divergent renames", "dr", of, fl) |
|
193 | act("divergent renames", "dr", of, fl) | |
195 |
|
194 |
General Comments 0
You need to be logged in to leave comments.
Login now