/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/blackbox/test_update.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
49
49
 
50
50
    def test_update_up_to_date_checkout(self):
51
51
        self.make_branch_and_tree('branch')
52
 
        self.run_bzr('checkout', 'branch', 'checkout')
53
 
        out, err = self.run_bzr('update', 'checkout')
 
52
        self.run_bzr('checkout branch checkout')
 
53
        out, err = self.run_bzr('update checkout')
54
54
        self.assertEqual('Tree is up to date at revision 0.\n', err)
55
55
        self.assertEqual('', out)
56
56
 
117
117
        # branch with local commits.
118
118
        master = self.make_branch_and_tree('master')
119
119
        # make a bound branch
120
 
        self.run_bzr('checkout', 'master', 'child')
 
120
        self.run_bzr('checkout master child')
121
121
        # get an object form of child
122
122
        child = WorkingTree.open('child')
123
123
        # check that out
124
 
        self.run_bzr('checkout', '--lightweight', 'child', 'checkout')
 
124
        self.run_bzr('checkout --lightweight child checkout')
125
125
        # get an object form of the checkout to manipulate
126
126
        wt = WorkingTree.open('checkout')
127
127
        # change master
144
144
 
145
145
        # now, update checkout ->
146
146
        # get all three files and a pending merge.
147
 
        out, err = self.run_bzr('update', 'checkout')
 
147
        out, err = self.run_bzr('update checkout')
148
148
        self.assertEqual('', out)
149
149
        self.assertContainsRe(err, '\+N  file')
150
150
        self.assertContainsRe(err, '\+N  file_b')
184
184
 
185
185
        # Merge the other branch into checkout
186
186
        os.chdir('checkout1')
187
 
        self.run_bzr('merge', '../other')
 
187
        self.run_bzr('merge ../other')
188
188
 
189
189
        self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
190
190
 
191
191
        # At this point, 'commit' should fail, because we are out of date
192
192
        self.run_bzr_error(["please run 'bzr update'"],
193
 
                           'commit', '-m', 'merged')
 
193
                           'commit -m merged')
194
194
 
195
195
        # This should not report about local commits being pending
196
196
        # merges, because they were real merges
209
209
        checkout = readonly_branch.create_checkout('checkout',
210
210
                                                   lightweight=True)
211
211
        tree.commit('empty commit')
212
 
        self.run_bzr(['update', 'checkout'])
 
212
        self.run_bzr('update checkout')