/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

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
    )
55
55
        self.assertTrue(self.tree.has_changes())
56
56
 
57
57
    def test_with_pending_merges(self):
58
 
        self.tree.commit('first commit')
59
 
        other_tree = self.tree.controldir.sprout('other').open_workingtree()
60
 
        other_tree.commit('mergeable commit')
 
58
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
 
59
        self.build_tree(['other/file'])
 
60
        other_tree.add('file')
 
61
        other_tree.commit('added file')
61
62
        self.tree.merge_from_branch(other_tree.branch)
62
63
        self.assertTrue(self.tree.has_changes())