~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
77
77
        self.assertPathDoesNotExist('checkout/added_in_2')
78
78
 
 
79
    def test_checkout_into_empty_dir(self):
 
80
        self.make_bzrdir('checkout')
 
81
        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
 
82
        result = bzrdir.BzrDir.open('checkout')
 
83
        tree = result.open_workingtree()
 
84
        branch = result.open_branch()
 
85
 
79
86
    def test_checkout_reconstitutes_working_trees(self):
80
87
        # doing a 'bzr checkout' in the directory of a branch with no tree
81
88
        # or a 'bzr checkout path' with path the name of a directory with