← 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:20:41 UTC
  • Revision ID: mbp@sourcefrog.net-20050705082041-6538a9ec26f7a59d
- Actually merge unsynchronized regions.  Woot!

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
87
87
                           (1,2, 2,3, 1,2),
88
88
                           (2,2, 3,3, 2,2),])
89
89
 
 
90
        self.assertEquals(list(m3.merge_regions()),
 
91
                          [('unchanged', 0, 1),
 
92
                           ('a', 1, 2),
 
93
                           ('unchanged', 1, 2),])
 
94
 
90
95
 
91
96
 
92
97
 
105
110
                           (1,2, 2,3, 2,3),
106
111
                           (2,2, 3,3, 3,3),])
107
112
 
 
113
        self.assertEquals(list(m3.merge_regions()),
 
114
                          [('unchanged', 0,1),
 
115
                           ('conflict', 1,2, 1,2),
 
116
                           ('unchanged', 1,2)])
 
117
 
108
118
 
109
119
 
110
120
class ReplaceClash(TestBase):