← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: Martin Pool
  • Date: 2007-04-24 05:02:04 UTC
  • mfrom: (2449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: mbp@sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
Merge trunk & fix NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
23
23
    bzrdir,
24
24
    dirstate,
25
25
    errors,
 
26
    inventory,
26
27
    workingtree_4,
27
28
    )
28
29
from bzrlib.lockdir import LockDir
464
465
        wt.commit('again')
465
466
        validate()
466
467
 
 
468
    def test_default_root_id(self):
 
469
        tree = self.make_branch_and_tree('tag', format='dirstate-tags')
 
470
        self.assertEqual(inventory.ROOT_ID, tree.get_root_id())
 
471
        tree = self.make_branch_and_tree('subtree',
 
472
                                         format='dirstate-with-subtree')
 
473
        self.assertNotEqual(inventory.ROOT_ID, tree.get_root_id())
 
474
 
467
475
    def test_non_subtree_with_nested_trees(self):
468
476
        # prior to dirstate, st/diff/commit ignored nested trees.
469
477
        # dirstate, as opposed to dirstate-with-subtree, should