← 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: Canonical.com Patch Queue Manager
  • Date: 2011-06-10 16:19:57 UTC
  • mfrom: (5954.2.7 merge-into-empty-fixups)
  • Revision ID: pqm@pqm.ubuntu.com-20110610161957-hh5ni839m7r3wsan
Cleanups and fixes for merging into null tree. (Aaron Bentley)

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)