← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2006-05-23 01:07:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: aaron.bentley@utoronto.ca-20060523010731-8ffa480f08c46c21
Reoganize patience-related code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
73
73
from difflib import SequenceMatcher
74
74
import os
75
75
import sha
76
 
# from difflib import unified_diff
77
 
from bzrlib.cdv.cdvdifflib import unified_diff
78
 
from bzrlib.cdv.cdvdifflib import SequenceMatcher
79
76
import time
80
77
 
81
78
from bzrlib.trace import mutter
87
84
        )
88
85
import bzrlib.errors as errors
89
86
from bzrlib.osutils import sha_strings
 
87
from bzrlib.patiencediff import SequenceMatcher, unified_diff
90
88
from bzrlib.symbol_versioning import *
91
89
from bzrlib.tsort import topo_sort
92
90
from bzrlib.versionedfile import VersionedFile, InterVersionedFile