~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
MergingĀ inĀ trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
140
140
        # smoke test for doing an update of a checkout of a bound
141
141
        # branch with local commits.
142
142
        master = self.make_branch_and_tree('master')
 
143
        master.commit('first commit')
143
144
        # make a bound branch
144
145
        self.run_bzr('checkout master child')
145
 
        # get an object form of child
146
 
        child = workingtree.WorkingTree.open('child')
147
146
        # check that out
148
147
        self.run_bzr('checkout --lightweight child checkout')
149
148
        # get an object form of the checkout to manipulate
158
157
        a_file = file('child/file_b', 'wt')
159
158
        a_file.write('Foo')
160
159
        a_file.close()
 
160
        # get an object form of child
 
161
        child = workingtree.WorkingTree.open('child')
161
162
        child.add(['file_b'])
162
163
        child_tip = child.commit('add file_b', local=True)
163
164
        # check checkout
174
175
All changes applied successfully.
175
176
+N  file
176
177
All changes applied successfully.
177
 
Updated to revision 1 of branch %s
 
178
Updated to revision 2 of branch %s
178
179
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
179
180
""" % osutils.pathjoin(self.test_dir, 'master',),
180
181
                         err)