← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2008-10-06 10:06:53 UTC
  • mto: (3926.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3928.
  • Revision ID: v.ladeuil+lp@free.fr-20081006100653-m74ulbg7rlfcuqox
Add a credential store for '.netrc'.

* plugins/netrc_credential_store/tests/test_netrc.py: 
Associated tests.

* plugins/netrc_credential_store/tests/__init__.py: 
Associated tests.

* plugins/netrc_credential_store/__init__.py: 
Provides a credential store for .netrc. This also documents how to
plug a credential store for authentication.conf.

* tests/__init__.py:
(TestCaseInTempDir.build_tree): Drive-by fix, use assertIsInstance
instead of assert_ to get a meaningful error message.

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