~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/diff.txt

  • Committer: Matthew Revell
  • Date: 2008-03-05 14:11:35 UTC
  • mto: This revision was merged to the branch mainline in revision 3263.
  • Revision ID: matthew.revell@canonical.com-20080305141135-96jf8j24b9crru6v
Added an admin-guide directory to doc/en and outlined headings for the admin guide in index.txt

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.