Show More
@@ -331,7 +331,10 b' def mergecopies(repo, c1, c2, ca):' | |||||
331 | m2 = c2.manifest() |
|
331 | m2 = c2.manifest() | |
332 | ma = ca.manifest() |
|
332 | ma = ca.manifest() | |
333 |
|
333 | |||
334 | # see _checkcopies documentation below for these dicts |
|
334 | # gather data from _checkcopies: | |
|
335 | # - diverge = record all diverges in this dict | |||
|
336 | # - copy = record all non-divergent copies in this dict | |||
|
337 | # - fullcopy = record all copies in this dict | |||
335 | diverge = {} # divergence data is shared |
|
338 | diverge = {} # divergence data is shared | |
336 | data1 = {'copy': {}, |
|
339 | data1 = {'copy': {}, | |
337 | 'fullcopy': {}, |
|
340 | 'fullcopy': {}, | |
@@ -507,10 +510,7 b' def _checkcopies(ctx, f, m1, m2, base, l' | |||||
507 | m2 = the destination manifest |
|
510 | m2 = the destination manifest | |
508 | base = the changectx used as a merge base |
|
511 | base = the changectx used as a merge base | |
509 | limit = the rev number to not search beyond |
|
512 | limit = the rev number to not search beyond | |
510 |
data = dictionary of dictionary to store copy data. |
|
513 | data = dictionary of dictionary to store copy data. (see mergecopies) | |
511 | - diverge = record all diverges in this dict |
|
|||
512 | - copy = record all non-divergent copies in this dict |
|
|||
513 | - fullcopy = record all copies in this dict |
|
|||
514 |
|
514 | |||
515 | note: limit is only an optimization, and there is no guarantee that |
|
515 | note: limit is only an optimization, and there is no guarantee that | |
516 | irrelevant revisions will not be limited |
|
516 | irrelevant revisions will not be limited |
General Comments 0
You need to be logged in to leave comments.
Login now