/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_commit.py

  • Committer: Daniel Watkins
  • Date: 2007-08-30 10:07:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2794.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070830100731-ie6j2bpvwjjb2ci8
Rewrapped lines longer than 79 characters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
183
183
            other_tree.rename_one('dirtorename', 'renameddir')
184
184
            other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
185
185
            other_tree.rename_one('filetorename', 'renamedfile')
186
 
            other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
 
186
            other_tree.rename_one('filetoreparent',
 
187
                                  'renameddir/reparentedfile')
187
188
            other_tree.remove(['dirtoremove', 'filetoremove'])
188
189
            self.build_tree_contents([
189
190
                ('other/newdir/',),
248
249
                             'checkout', retcode=3)
249
250
        self.assertEqual(output,
250
251
                         ('',
251
 
                          "bzr: ERROR: Working tree is out of date, please run "
252
 
                          "'bzr update'.\n"))
 
252
                          "bzr: ERROR: Working tree is out of date, please "
 
253
                          "run 'bzr update'.\n"))
253
254
 
254
255
    def test_local_commit_unbound(self):
255
256
        # a --local commit on an unbound branch is an error