← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_checkout.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_checkout.py
64
64
                         result.open_branch().bzrdir.root_transport.base)
65
65
 
66
66
    def test_checkout_dash_r(self):
67
 
        self.run_bzr('checkout -r -2 branch checkout')
 
67
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
 
68
        self.assertContainsRe(out, 'Copying history to "checkout".')
68
69
        # the working tree should now be at revision '1' with the content
69
70
        # from 1.
70
71
        result = bzrdir.BzrDir.open('checkout')
72
73
        self.failIfExists('checkout/added_in_2')
73
74
 
74
75
    def test_checkout_light_dash_r(self):
75
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
76
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
 
77
            'branch', 'checkout'])
 
78
        self.assertNotContainsRe(out, 'Copying history')
76
79
        # the working tree should now be at revision '1' with the content
77
80
        # from 1.
78
81
        result = bzrdir.BzrDir.open('checkout')