/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/developers/merge-scaling.txt

  • Committer: Robert Collins
  • Date: 2008-04-08 21:41:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3350.
  • Revision ID: robertc@robertcollins.net-20080408214115-qiz6rr5kyt5mxsyi
 * ``VersionedFile.clear_cache`` and ``enable_cache`` are deprecated.
   These methods added significant complexity to the ``VersionedFile``
   implementation, but were only used for optimising fetches from knits - 
   which can be done from outside the knit layer, or via a caching
   decorator. As knits are not the default format, the complexity is no
   longer worth paying. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/merge-scaling.txt
19
19
:c: files that differ between base and other:
20
20
:d: number of files in the tree
21
21
:e: number of lines in the text
22
 
:f: number of files requiring text merge
 
22
:f: number number of files requiring text merge
23
23
:g: number of conflicts (g <= c)
24
24
:h: humber of uncommon ancestors
25
25
:i: number of revisions between base and other