/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/diff.txt

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-06-08 05:00:01 UTC
  • mto: (4441.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: nmb@wartburg.edu-20090608050001-7znk3433urf3bf0p
Fix 269477 Add documentation about diverged branches and refer to it when pushing fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/diff.txt
61
61
that only certain files should be compared.
62
62
 
63
63
Performance can be further improved by caching comparisons to avoid repeating
64
 
them.  Caching could potentially be performed by ``diff`` and perhaps by
 
64
them.  Caching could potentially be performed by ``diff`` and perhaps by 
65
65
``merge``.  Merge is aware of the relationship of a text merge's result to
66
66
the THIS value, and the THIS value is generally the basis value.  So the
67
67
comparison is latent, but present.  The only issue is extracting it.