← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.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/merge3.py
19
19
# s: "i hate that."
20
20
 
21
21
 
22
 
from bzrlib.cdvdifflib import SequenceMatcher
 
22
#from bzrlib.cdv.difflib import SequenceMatcher
 
23
from difflib import SequenceMatcher
23
24
from bzrlib.errors import CantReprocessAndShowBase
24
25
 
25
26
def intersect(ra, rb):
380
381
        # don't sync-up on lines containing only blanks or pounds
381
382
        junk_re = re.compile(r'^[ \t#]*$')
382
383
        
383
 
        am = SequenceMatcher(junk_re.match, self.base, self.a).get_matching_blocks()
384
 
        bm = SequenceMatcher(junk_re.match, self.base, self.b).get_matching_blocks()
 
384
        am = SequenceMatcher(None, self.base, self.a).get_matching_blocks()
 
385
        bm = SequenceMatcher(None, self.base, self.b).get_matching_blocks()
385
386
 
386
387
        unc = []
387
388