← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-13 18:38:58 UTC
  • mfrom: (1863 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1869.
  • Revision ID: john@arbash-meinel.com-20060713183858-ebf4aa1f9ef8bb6e
[merge] bzr.dev 1863

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
20
20
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
21
21
                              UnversionedParent, ParentLoop)
22
22
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
23
 
                           ReusingTransform, CantMoveRoot, NotVersionedError,
24
 
                           ExistingLimbo, ImmortalLimbo, LockError)
 
23
                           ReusingTransform, CantMoveRoot, 
 
24
                           PathsNotVersionedError, ExistingLimbo,
 
25
                           ImmortalLimbo, LockError)
25
26
from bzrlib.osutils import file_kind, has_symlinks, pathjoin
26
27
from bzrlib.merge import Merge3Merger
27
28
from bzrlib.tests import TestCaseInTempDir, TestSkipped, TestCase
492
493
        create.apply()
493
494
        self.assertEqual(find_interesting(wt, wt, ['vfile']),
494
495
                         set(['myfile-id']))
495
 
        self.assertRaises(NotVersionedError, find_interesting, wt, wt,
 
496
        self.assertRaises(PathsNotVersionedError, find_interesting, wt, wt,
496
497
                          ['uvfile'])
497
498
 
498
499
    def test_set_executability_order(self):