← 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: Vincent Ladeuil
  • Date: 2011-05-31 10:01:15 UTC
  • mto: (5993.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5994.
  • Revision ID: v.ladeuil+lp@free.fr-20110531100115-bkea029bq5oki70l
Put the '\n' back into the formats and fix tests accordingly (reducing code duplication).

Show diffs side-by-side

added added

removed removed

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