Skip to content
Snippets Groups Projects
Commit e2bfe2d5 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

copies: move variable document from checkcopies to mergecopies

It appears that 'mergecopies' is the function consuming these data so we move
the documentation there.
parent 7321c6b0
No related branches found
No related tags found
No related merge requests found
......@@ -331,7 +331,10 @@
m2 = c2.manifest()
ma = ca.manifest()
# see _checkcopies documentation below for these dicts
# gather data from _checkcopies:
# - diverge = record all diverges in this dict
# - copy = record all non-divergent copies in this dict
# - fullcopy = record all copies in this dict
diverge = {} # divergence data is shared
data1 = {'copy': {},
'fullcopy': {},
......@@ -507,10 +510,7 @@
m2 = the destination manifest
base = the changectx used as a merge base
limit = the rev number to not search beyond
data = dictionary of dictionary to store copy data. The keys are:
- diverge = record all diverges in this dict
- copy = record all non-divergent copies in this dict
- fullcopy = record all copies in this dict
data = dictionary of dictionary to store copy data. (see mergecopies)
note: limit is only an optimization, and there is no guarantee that
irrelevant revisions will not be limited
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment