/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.rst

  • Committer: Ian Clatworthy
  • Date: 2007-06-06 05:56:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2513.
  • Revision ID: ian.clatworthy@internode.on.net-20070606055603-monl116zotkbqn2y
commit.py clean-up including logging just to stderr, not bzr.log

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/merge-scaling.rst
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
26
26
 
27
27
Needs
28
 
-----
 
28
=====
29
29
- Access to revision graph proportional to number of revisions read
30
30
- Access to changed file metadata proportional to number of changes and number of intervening revisions.
31
31
- O(1) access to fulltexts
32
32
 
33
33
Notes
34
 
-----
 
34
=====
35
35
Multiparent deltas may offer some nice properties for performance of annotation based merging.