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

  • Committer: Bastian Bowe
  • Date: 2011-08-08 12:47:07 UTC
  • mto: (6015.14.1 bzr24-filter-809901)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: bastian.bowe@gmail.com-20110808124707-3jegg252r1d804v0
https://launchpad.net/bugs/809901
Merged fix regarding error in CHKInventory.filter method from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconfigure.py
46
46
 
47
47
    def test_tree_with_pending_merge_to_branch(self):
48
48
        tree = self.make_branch_and_tree('tree')
 
49
        tree.commit('unchanged')
49
50
        other_tree = tree.bzrdir.sprout('other').open_workingtree()
50
 
        self.build_tree(['other/file'])
51
 
        other_tree.add('file')
52
 
        other_tree.commit('file added')
 
51
        other_tree.commit('mergeable commit')
53
52
        tree.merge_from_branch(other_tree.branch)
54
53
        reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
55
54
        self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)