/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: 2007-12-07 22:46:31 UTC
  • mto: (2929.3.16 https) (3097.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3099.
  • Revision ID: v.ladeuil+lp@free.fr-20071207224631-eauq1t40u3jqh9rw
Spiv review feedback.

* bzrlib/tests/test_http_response.py:
Redesigned following spiv advices (with some liberties so all
errors are still mine ;).

* bzrlib/tests/test_errors.py:
Add tests for InvalidRange and InvalidHttpRange.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.get_multiple_ranges): One boundary line
before each range and one final boundary line.

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