/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: John Arbash Meinel
  • Date: 2009-10-15 04:01:26 UTC
  • mfrom: (4734.3.1 2.1.0b1)
  • mto: This revision was merged to the branch mainline in revision 4747.
  • Revision ID: john@arbash-meinel.com-20091015040126-a0aeamcjsjeredvv
Merge the 2.1.0b1 branch.

Update NEWS to handle the various cases got shuffled around,
including moving 'in progress' stuff up into the current development
section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.