← 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: Aaron Bentley
  • Date: 2006-03-07 05:59:14 UTC
  • mfrom: (1558.1.20 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1595.
  • Revision ID: aaron.bentley@utoronto.ca-20060307055914-a88728997afceb90
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
71
71
        # of date checkout
72
72
        self.make_branch_and_tree('branch')
73
73
        # make a checkout
74
 
        self.runbzr('checkout branch checkout')
 
74
        self.runbzr('checkout --lightweight branch checkout')
75
75
        # commit to the original branch to make the checkout out of date
76
76
        self.runbzr('commit --unchanged -m message branch')
77
77
        # now commit to the checkout should emit
82
82
                         ('',
83
83
                          "bzr: ERROR: Working tree is out of date, please run "
84
84
                          "'bzr update'.\n"))
 
85
 
 
86
    def test_local_commit_unbound(self):
 
87
        # a --local commit on an unbound branch is an error
 
88
        self.make_branch_and_tree('.')
 
89
        out, err = self.run_bzr('commit', '--local', retcode=3)
 
90
        self.assertEqualDiff('', out)
 
91
        self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
 
92
                             'on unbound branches.\n', err)