Show More
@@ -419,8 +419,10 b' def mergecopies(repo, c1, c2, base):' | |||||
419 | for f in u2u: |
|
419 | for f in u2u: | |
420 | _checkcopies(c2, c1, f, base, tca, dirtyc2, limit, data2) |
|
420 | _checkcopies(c2, c1, f, base, tca, dirtyc2, limit, data2) | |
421 |
|
421 | |||
422 |
copy = dict(data1['copy'] |
|
422 | copy = dict(data1['copy']) | |
423 | fullcopy = dict(data1['fullcopy'].items() + data2['fullcopy'].items()) |
|
423 | copy.update(data2['copy']) | |
|
424 | fullcopy = dict(data1['fullcopy']) | |||
|
425 | fullcopy.update(data2['fullcopy']) | |||
424 |
|
426 | |||
425 | if dirtyc1: |
|
427 | if dirtyc1: | |
426 | _combinecopies(data2['incomplete'], data1['incomplete'], copy, diverge, |
|
428 | _combinecopies(data2['incomplete'], data1['incomplete'], copy, diverge, |
General Comments 0
You need to be logged in to leave comments.
Login now