← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_bound_branches.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
422
422
        self.check_revno(4)
423
423
        self.check_revno(4, '../base')
424
424
 
 
425
    def test_bind_directory(self):
 
426
        """Test --directory option"""
 
427
        tree = self.make_branch_and_tree('base')
 
428
        self.build_tree(['base/a', 'base/b'])
 
429
        tree.add('a', 'b')
 
430
        tree.commit(message='init')
 
431
        branch = tree.branch
 
432
        tree.bzrdir.sprout('child')
 
433
        self.run_bzr('bind --directory=child base')
 
434
        d = BzrDir.open('child')
 
435
        self.assertNotEqual(None, d.open_branch().get_master_branch())
 
436
        self.run_bzr('unbind -d child')
 
437
        self.assertEqual(None, d.open_branch().get_master_branch())
 
438
        self.run_bzr('unbind --directory child', retcode=3)
 
439
 
425
440
 
426
441
class TestBind(script.TestCaseWithTransportAndScript):
427
442