← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to testweave.py

  • Committer: Martin Pool
  • Date: 2005-06-28 07:08:58 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050628070858-6c2a057c77ed9a14
More tests for nested insert instructions

Show diffs side-by-side

added added

removed removed

Lines of Context:
testweave.py
169
169
        k._v = [VerInfo([]),
170
170
                VerInfo([0]),
171
171
                VerInfo([0]),
 
172
                VerInfo([0,1,2]),
172
173
                ]
173
174
        k._l = [('{', 0),
174
175
                'foo {',
192
193
                          '  also from v1',
193
194
                          '}'])
194
195
                       
 
196
        self.assertEqual(k.get(2),
 
197
                         ['foo {',
 
198
                          '  added in v2',
 
199
                          '}'])
 
200
 
 
201
        self.assertEqual(k.get(3),
 
202
                         ['foo {',
 
203
                          '  added in version 1',
 
204
                          '  added in v2',
 
205
                          '  also from v1',
 
206
                          '}'])
 
207
                         
 
208
                       
195
209
        
196
210
 
197
211
class DeleteLines(TestBase):