/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: 2007-09-18 18:55:00 UTC
  • mto: (2866.1.1 james.westby)
  • mto: This revision was merged to the branch mainline in revision 2867.
  • Revision ID: jw+debian@jameswestby.net-20070918185500-91alkjx8zolds1v8
Fix log against smart server branches that don't support tags. (#140615)

Add get_reverse_tag_dict to DisabledTags for branches that falsely
claim that they support tags (namely smart server branches). When the
remote branch was an old format without tags this caused log to fail.

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