← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
https://launchpad.net/bugs/177390
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
167
167
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
168
168
        self.assertEqual('', out)
169
169
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
170
 
 
171
 
    def test_annotate_without_workingtree(self):
172
 
        tree = self.make_branch_and_tree('branch')
173
 
        self.build_tree_contents([('branch/empty', '')])
174
 
        tree.add('empty')
175
 
        tree.commit('add empty file')
176
 
        bzrdir = tree.branch.bzrdir
177
 
        bzrdir.destroy_workingtree()
178
 
        self.assertFalse(bzrdir.has_workingtree())
179
 
 
180
 
        os.chdir('branch')
181
 
        out, err = self.run_bzr('annotate empty')
182
 
        self.assertEqual('', out)