Show More
@@ -277,6 +277,8 b' def mergecopies(repo, c1, c2, ca):' | |||||
277 | if limit is None: |
|
277 | if limit is None: | |
278 | # no common ancestor, no copies |
|
278 | # no common ancestor, no copies | |
279 | return {}, {}, {}, {} |
|
279 | return {}, {}, {}, {} | |
|
280 | repo.ui.debug(" searching for copies back to rev %d\n" % limit) | |||
|
281 | ||||
280 | m1 = c1.manifest() |
|
282 | m1 = c1.manifest() | |
281 | m2 = c2.manifest() |
|
283 | m2 = c2.manifest() | |
282 | ma = ca.manifest() |
|
284 | ma = ca.manifest() | |
@@ -321,8 +323,6 b' def mergecopies(repo, c1, c2, ca):' | |||||
321 | fullcopy1, fullcopy2 = {}, {} |
|
323 | fullcopy1, fullcopy2 = {}, {} | |
322 | diverge = {} |
|
324 | diverge = {} | |
323 |
|
325 | |||
324 | repo.ui.debug(" searching for copies back to rev %d\n" % limit) |
|
|||
325 |
|
||||
326 | addedinm1 = m1.filesnotin(ma) |
|
326 | addedinm1 = m1.filesnotin(ma) | |
327 | addedinm2 = m2.filesnotin(ma) |
|
327 | addedinm2 = m2.filesnotin(ma) | |
328 | u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) |
|
328 | u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) |
General Comments 0
You need to be logged in to leave comments.
Login now