/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: Vincent Ladeuil
  • Date: 2008-01-29 11:53:31 UTC
  • mto: (3206.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3207.
  • Revision ID: v.ladeuil+lp@free.fr-20080129115331-n7nl3ljtkepljzwi
Fix two more leaked tmp dirs.

* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Clean up tmp dir.

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