/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-09 00:34:54 UTC
  • mto: This revision was merged to the branch mainline in revision 3350.
  • Revision ID: robertc@robertcollins.net-20080409003454-x19fm1n0o2govzh6
 * ``VersionedFile.annotate_iter`` is deprecated. While in principal this
   allows lower memory use, all users of annotations wanted full file 
   annotations, and there is no storage format suitable for incremental
   line-by-line annotation. (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