/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 breezy/tests/blackbox/test_annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_annotate.py
295
295
        self.build_tree_contents([('empty', '')])
296
296
        tree.add('empty')
297
297
        tree.commit('add empty file')
298
 
        bzrdir = tree.branch.bzrdir
 
298
        bzrdir = tree.branch.controldir
299
299
        bzrdir.destroy_workingtree()
300
300
        self.assertFalse(bzrdir.has_workingtree())
301
301
        out, err = self.run_bzr(['annotate', 'empty'])