← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-10 03:38:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: john@arbash-meinel.com-20051110033819-a2a0829773b88f80
Added (failing) tests for cdv.recurse_matches with common sections,
moved codeville code into separate directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
24
24
 
25
25
def internal_diff(old_label, oldlines, new_label, newlines, to_file,
26
26
        sequence_matcher=None):
27
 
    from bzrlib.cdvdifflib import unified_diff
28
 
    from bzrlib.cdvdifflib import SequenceMatcher
 
27
    from bzrlib.cdv.difflib import unified_diff
 
28
    from bzrlib.cdv.difflib import SequenceMatcher
29
29
    
30
30
    # FIXME: difflib is wrong if there is no trailing newline.
31
31
    # The syntax used by patch seems to be "\ No newline at