/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: James Westby
  • Date: 2009-02-20 20:10:12 UTC
  • mto: This revision was merged to the branch mainline in revision 4049.
  • Revision ID: jw+debian@jameswestby.net-20090220201012-y9wonjwu4ekt7iqe
Handle files that are not present in the tree when exporting (#174539)

When export is acting on a working tree (unusual) it may encounter files
that are missing. It should not try and export these.

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