~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
        self.build_tree(['hello.txt'])
44
44
        out,err = self.run_bzr('commit -m empty', retcode=3)
45
45
        self.assertEqual('', out)
46
 
        self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
47
 
                                  ' use --unchanged to commit anyhow\n')
 
46
        self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
 
47
                                  ' Use --unchanged to commit anyhow.\n')
48
48
 
49
49
    def test_commit_success(self):
50
50
        """Successful commit should not leave behind a bzr-commit-* file"""
395
395
 
396
396
        # With no changes, it should just be 'no changes'
397
397
        # Make sure that commit is failing because there is nothing to do
398
 
        self.run_bzr_error(['no changes to commit'],
 
398
        self.run_bzr_error(['No changes to commit'],
399
399
                           'commit --strict -m no-changes',
400
400
                           working_dir='tree')
401
401