← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconfigure.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

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')
50
49
        other_tree = tree.bzrdir.sprout('other').open_workingtree()
51
 
        other_tree.commit('mergeable commit')
 
50
        self.build_tree(['other/file'])
 
51
        other_tree.add('file')
 
52
        other_tree.commit('file added')
52
53
        tree.merge_from_branch(other_tree.branch)
53
54
        reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
54
55
        self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)