~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 2502.1.14
• compare with another revision
• download diff
• download tarball
• view history from revision 2502.1.14

• reverse the comparison (2502.1.14 to 5200.3.5)
• stop comparing with revision 5200.3.5

Show diffs side-by-side

added

removed

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.

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1