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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_mutabletree.py
19
19
Most functionality of MutableTree is tested as part of WorkingTree.
20
20
"""
21
21
 
22
 
from .. import (
 
22
from brzlib import (
23
23
    mutabletree,
24
24
    tests,
25
25
    )
56
56
 
57
57
    def test_with_pending_merges(self):
58
58
        self.tree.commit('first commit')
59
 
        other_tree = self.tree.controldir.sprout('other').open_workingtree()
 
59
        other_tree = self.tree.bzrdir.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())