← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Robert Collins
  • Date: 2005-10-27 19:45:18 UTC
  • mfrom: (1185.16.130)
  • Revision ID: robertc@robertcollins.net-20051027194518-58afabc9ab280bb0
Merge from Martin

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 difflib import SequenceMatcher
22
23
 
23
24
def intersect(ra, rb):
24
25
    """Given two ranges return the range where they intersect or None.
67
68
        self.base = base
68
69
        self.a = a
69
70
        self.b = b
70
 
        from difflib import SequenceMatcher
71
 
        self.a_ops = SequenceMatcher(None, base, a).get_opcodes()
72
 
        self.b_ops = SequenceMatcher(None, base, b).get_opcodes()
73
71
 
74
72
 
75
73
 
279
277
        Generates a list of (base1, base2, a1, a2, b1, b2).  There is
280
278
        always a zero-length sync region at the end of all the files.
281
279
        """
282
 
        from difflib import SequenceMatcher
283
280
 
284
281
        ia = ib = 0
285
282
        amatches = SequenceMatcher(None, self.base, self.a).get_matching_blocks()
339
336
 
340
337
    def find_unconflicted(self):
341
338
        """Return a list of ranges in base that are not conflicted."""
342
 
        from difflib import SequenceMatcher
343
339
 
344
340
        import re
345
341