~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2008-10-17 08:05:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3786.
  • Revision ID: mbp@sourcefrog.net-20081017080503-u801jhy4h66dy638
Updated release process documentation.

This separates out the things that need to be done *to make the release*
from things that are done at other times in the cycle or by other people

doc.bazaar-vcs.org is now automatically updated and doesn't need manual
intervention.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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