← 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: Aaron Bentley
  • Date: 2011-06-09 18:46:24 UTC
  • mto: (5954.6.3 795456-eager-test)
  • mto: This revision was merged to the branch mainline in revision 5967.
  • Revision ID: aaron@aaronbentley.com-20110609184624-3manailsshjbz2ve
Fix broken tests.

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')
143
144
        # make a bound branch
144
145
        self.run_bzr('checkout master child')
145
146
        # get an object form of child
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)