/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): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_mutabletree.py
19
19
Most functionality of MutableTree is tested as part of WorkingTree.
20
20
"""
21
21
 
22
 
from bzrlib import (
 
22
from .. 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.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())