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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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 bzrlib 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())