← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 04:29:35 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405042935-7a86762d00a3ae2e
Got all tests passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
22
22
from bzrlib.branch import Branch
23
23
import bzrlib.bzrdir as bzrdir
24
24
from bzrlib.bzrdir import BzrDir
 
25
from bzrlib.conflicts import *
25
26
import bzrlib.errors as errors
26
27
from bzrlib.errors import NotBranchError, NotVersionedError
27
28
from bzrlib.lockdir import LockDir
213
214
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflict_lines,
214
215
                          None)
215
216
        file('lala.BASE', 'wb').write('labase')
216
 
        expected = ('contents conflict', None, 'lala')
 
217
        expected = ContentsConflict('lala')
217
218
        self.assertEqual(list(tree.conflict_lines()), [expected])
218
219
        file('lala', 'wb').write('la')
219
220
        tree.add('lala', 'lala-id')
220
 
        expected = ('contents conflict', 'lala-id', 'lala')
 
221
        expected = ContentsConflict('lala', file_id='lala-id')
221
222
        self.assertEqual(list(tree.conflict_lines()), [expected])
222
223
        file('lala.THIS', 'wb').write('lathis')
223
224
        file('lala.OTHER', 'wb').write('laother')
224
225
        # When "text conflict"s happen, stem, THIS and OTHER are text
225
 
        expected = ('text conflict', 'lala-id', 'lala')
 
226
        expected = TextConflict('lala', file_id='lala-id')
226
227
        self.assertEqual(list(tree.conflict_lines()), [expected])
227
228
        os.unlink('lala.OTHER')
228
229
        os.mkdir('lala.OTHER')
229
 
        expected = ('contents conflict', 'lala-id', 'lala')
 
230
        expected = ContentsConflict('lala', file_id='lala-id')
230
231
        self.assertEqual(list(tree.conflict_lines()), [expected])