/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
331
331
                                     './.bzr/repository',
332
332
                                     ])
333
333
        self.assertRepositoryHasSameItems(tree.branch.repository,
334
 
            target.open_repository())
 
334
            target.open_branch().repository)
335
335
        target.open_workingtree().revert()
336
336
 
337
337
    def test_revert_inventory(self):
351
351
                                     './.bzr/repository',
352
352
                                     ])
353
353
        self.assertRepositoryHasSameItems(tree.branch.repository,
354
 
            target.open_repository())
 
354
            target.open_branch().repository)
355
355
 
356
356
        target.open_workingtree().revert()
357
357
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
363
363
                                     './.bzr/repository',
364
364
                                     ])
365
365
        self.assertRepositoryHasSameItems(tree.branch.repository,
366
 
            target.open_repository())
 
366
            target.open_branch().repository)
367
367
 
368
368
    def test_clone_bzrdir_tree_branch_reference(self):
369
369
        # a tree with a branch reference (aka a checkout)
503
503
        self.assertNotEqual(dir.transport.base, target.transport.base)
504
504
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
505
505
                                    [
506
 
                                     './.bzr/branch/branch.conf',
507
 
                                     './.bzr/branch/parent',
 
506
                                     './.bzr/branch',
508
507
                                     './.bzr/checkout/dirstate',
509
508
                                     './.bzr/checkout/stat-cache',
510
509
                                     './.bzr/checkout/inventory',