← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

(mbp) merge bzr.dev to 0.8, prepare for release

Show diffs side-by-side

added added

removed removed

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