/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-08-31 19:39:01 UTC
  • mto: (3669.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3670.
  • Revision ID: v.ladeuil+lp@free.fr-20080831193901-q64gd8ekc3lyrjdl
Fix bug #263249 by setting valid default _param_name.

* bzrlib/tests/test_options.py:
(TestListOptions.test_list_option_with_dash): Test that long list
options got valid _param_name.

* bzrlib/option.py:
(Option.__init__): Ensure that _param_name got a legal python
attribute name (as optparse do).

* bzrlib/commands.py:
(Command.get_help_text): Drive-by typo correction.

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