← 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: Aaron Bentley
  • Date: 2011-06-09 18:46:24 UTC
  • mto: (5954.6.3 795456-eager-test)
  • mto: This revision was merged to the branch mainline in revision 5967.
  • Revision ID: aaron@aaronbentley.com-20110609184624-3manailsshjbz2ve
Fix broken tests.

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
51
        other_tree.commit('file added')
53
52
        tree.merge_from_branch(other_tree.branch)
54
53
        reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)