← 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: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
20
20
 
21
21
import bzrlib
22
22
from bzrlib.branch import Branch
23
 
from bzrlib import bzrdir, conflicts, errors, workingtree
 
23
import bzrlib.bzrdir as bzrdir
24
24
from bzrlib.bzrdir import BzrDir
 
25
from bzrlib.conflicts import *
 
26
import bzrlib.errors as errors
25
27
from bzrlib.errors import NotBranchError, NotVersionedError
26
28
from bzrlib.lockdir import LockDir
27
29
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
28
30
from bzrlib.tests import TestCaseWithTransport, TestSkipped
29
31
from bzrlib.trace import mutter
30
32
from bzrlib.transport import get_transport
 
33
import bzrlib.workingtree as workingtree
31
34
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
32
35
                                WorkingTree)
33
36
 
216
219
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
217
220
                          None)
218
221
        file('lala.BASE', 'wb').write('labase')
219
 
        expected = conflicts.ContentsConflict('lala')
 
222
        expected = ContentsConflict('lala')
220
223
        self.assertEqual(list(tree.conflicts()), [expected])
221
224
        file('lala', 'wb').write('la')
222
225
        tree.add('lala', 'lala-id')
223
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
 
226
        expected = ContentsConflict('lala', file_id='lala-id')
224
227
        self.assertEqual(list(tree.conflicts()), [expected])
225
228
        file('lala.THIS', 'wb').write('lathis')
226
229
        file('lala.OTHER', 'wb').write('laother')
227
230
        # When "text conflict"s happen, stem, THIS and OTHER are text
228
 
        expected = conflicts.TextConflict('lala', file_id='lala-id')
 
231
        expected = TextConflict('lala', file_id='lala-id')
229
232
        self.assertEqual(list(tree.conflicts()), [expected])
230
233
        os.unlink('lala.OTHER')
231
234
        os.mkdir('lala.OTHER')
232
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
 
235
        expected = ContentsConflict('lala', file_id='lala-id')
233
236
        self.assertEqual(list(tree.conflicts()), [expected])
234
237
 
235
238