← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2006-03-05 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: robertc@robertcollins.net-20060305114854-d95dbe4adfee32e9
Make bound branch creation happen via 'checkout'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
32
32
        self.assertEqual('Tree is up to date.\n', err)
33
33
        self.assertEqual('', out)
34
34
 
35
 
    def test_update_up_to_date_checkout(self):
 
35
    def test_update_up_to_date_light_checkout(self):
36
36
        self.make_branch_and_tree('branch')
37
 
        self.runbzr('checkout branch checkout')
 
37
        self.runbzr('checkout --lightweight branch checkout')
38
38
        out, err = self.runbzr('update checkout')
39
39
        self.assertEqual('Tree is up to date.\n', err)
40
40
        self.assertEqual('', out)
45
45
        raise TestSkipped('default format too old')
46
46
        self.make_branch_and_tree('branch')
47
47
        # make a checkout
48
 
        self.runbzr('checkout branch checkout')
 
48
        self.runbzr('checkout --lightweight branch checkout')
49
49
        self.build_tree(['checkout/file'])
50
50
        self.runbzr('add checkout/file')
51
51
        self.runbzr('commit -m add-file checkout')
55
55
        self.assertEqual('', err)
56
56
        self.failUnlessExists('branch/file')
57
57
 
58
 
    def test_update_out_of_date_checkout(self):
 
58
    def test_update_out_of_date_light_checkout(self):
59
59
        self.make_branch_and_tree('branch')
60
60
        # make two checkouts
61
 
        self.runbzr('checkout branch checkout')
62
 
        self.runbzr('checkout branch checkout2')
 
61
        self.runbzr('checkout --lightweight branch checkout')
 
62
        self.runbzr('checkout --lightweight branch checkout2')
63
63
        self.build_tree(['checkout/file'])
64
64
        self.runbzr('add checkout/file')
65
65
        self.runbzr('commit -m add-file checkout')
73
73
    def test_update_conflicts_returns_2(self):
74
74
        self.make_branch_and_tree('branch')
75
75
        # make two checkouts
76
 
        self.runbzr('checkout branch checkout')
 
76
        self.runbzr('checkout --lightweight branch checkout')
77
77
        self.build_tree(['checkout/file'])
78
78
        self.runbzr('add checkout/file')
79
79
        self.runbzr('commit -m add-file checkout')
80
 
        self.runbzr('checkout branch checkout2')
 
80
        self.runbzr('checkout --lightweight branch checkout2')
81
81
        # now alter file in checkout
82
82
        a_file = file('checkout/file', 'wt')
83
83
        a_file.write('Foo')
100
100
        # branch with local commits.
101
101
        self.make_branch_and_tree('master')
102
102
        # make a bound branch
103
 
        self.run_bzr('get', '--bound', 'master', 'child')
 
103
        self.run_bzr('checkout', 'master', 'child')
104
104
        # check that out
105
 
        self.run_bzr('checkout', 'child', 'checkout')
 
105
        self.run_bzr('checkout', '--lightweight', 'child', 'checkout')
106
106
        # change master
107
107
        a_file = file('master/file', 'wt')
108
108
        a_file.write('Foo')