← 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 08:30:08 UTC
  • Revision ID: mbp@sourcefrog.net-20050705083008-4e40cfceb9f6bdb1
- new Merge3.merge_groups feeds back the merged lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
37
37
        self.assertEquals(list(m3.merge_regions()),
38
38
                          [('unchanged', 0, 2)])
39
39
 
 
40
        self.assertEquals(list(m3.merge_groups()),
 
41
                          [('unchanged', ['aaa', 'bbb'])])
 
42
 
40
43
 
41
44
class FrontInsert(TestBase):
42
45
    def runTest(self):
53
56
        self.assertEquals(list(m3.merge_regions()),
54
57
                          [('a', 0, 2),
55
58
                           ('unchanged', 0, 1)])
 
59
 
 
60
        self.assertEquals(list(m3.merge_groups()),
 
61
                          [('a', ['aaa', 'bbb']),
 
62
                           ('unchanged', ['zz'])])
56
63
        
57
64
    
58
65
 
112
119
 
113
120
        self.assertEquals(list(m3.merge_regions()),
114
121
                          [('unchanged', 0,1),
115
 
                           ('conflict', 1,2, 1,2),
 
122
                           ('conflict', 1,1, 1,2, 1,2),
116
123
                           ('unchanged', 1,2)])
117
124
 
 
125
        self.assertEquals(list(m3.merge_groups()),
 
126
                          [('unchanged', ['aaa']),
 
127
                           ('conflict', [], ['111'], ['222']),
 
128
                           ('unchanged', ['bbb']),
 
129
                           ])
 
130
 
118
131
 
119
132
 
120
133
class ReplaceClash(TestBase):