← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2009-09-14 01:48:28 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914014828-ydr9rlkdfq2sv57z
Merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
273
273
        self.build_tree_contents([
274
274
            ('branch/foo.c', 'int main() {}'),
275
275
            ('branch/bar.c', 'int main() {}')])
276
 
        inner_tree.add('foo.c')
277
 
        inner_tree.add('bar.c')
 
276
        inner_tree.add(['foo.c', 'bar.c'])
278
277
        # can't commit files in different trees; sane error
279
278
        self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
 
279
        # can commit to branch - records foo.c only
280
280
        self.run_bzr('commit -m newstuff branch/foo.c')
 
281
        # can commit to branch - records bar.c
281
282
        self.run_bzr('commit -m newstuff branch')
282
 
        self.run_bzr('commit -m newstuff branch', retcode=3)
 
283
        # No changes left
 
284
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
283
285
 
284
286
    def test_out_of_date_tree_commit(self):
285
287
        # check we get an error code and a clear message committing with an out