/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Aaron Bentley
  • Date: 2006-05-20 17:51:13 UTC
  • mfrom: (1718 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: aaron.bentley@utoronto.ca-20060520175113-4549e0023f9210bf
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
22
22
from bzrlib.cdv.cdvdifflib import SequenceMatcher
23
23
#from difflib import SequenceMatcher
24
24
from bzrlib.errors import CantReprocessAndShowBase
 
25
from bzrlib.textfile import check_text_lines
25
26
 
26
27
def intersect(ra, rb):
27
28
    """Given two ranges return the range where they intersect or None.
67
68
    incorporating the changes from both BASE->OTHER and BASE->THIS.
68
69
    All three will typically be sequences of lines."""
69
70
    def __init__(self, base, a, b):
 
71
        check_text_lines(base)
 
72
        check_text_lines(a)
 
73
        check_text_lines(b)
70
74
        self.base = base
71
75
        self.a = a
72
76
        self.b = b