← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-07-05 09:04:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050705090423-e41ae78e4986e5a1
- handle chunks which differ from the base but agree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
104
104
 
105
105
 
106
106
 
 
107
class InsertAgreement(TestBase):
 
108
    def runTest(self):
 
109
        m3 = Merge3(['aaa\n', 'bbb\n'],
 
110
                    ['aaa\n', '222\n', 'bbb\n'],
 
111
                    ['aaa\n', '222\n', 'bbb\n'])
 
112
 
 
113
        self.assertEquals(''.join(m3.merge_lines()),
 
114
                          'aaa\n222\nbbb\n')
 
115
 
 
116
 
107
117
 
108
118
class InsertClash(TestBase):
109
119
    """Both try to insert lines in the same place."""