/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/test_mutabletree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_mutabletree.py
56
56
 
57
57
    def test_with_pending_merges(self):
58
58
        self.tree.commit('first commit')
59
 
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
 
59
        other_tree = self.tree.controldir.sprout('other').open_workingtree()
60
60
        other_tree.commit('mergeable commit')
61
61
        self.tree.merge_from_branch(other_tree.branch)
62
62
        self.assertTrue(self.tree.has_changes())