← 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: Vincent Ladeuil
  • Date: 2011-06-10 08:11:44 UTC
  • mto: (5954.2.5 merge-into-empty-fixups)
  • mto: This revision was merged to the branch mainline in revision 5967.
  • Revision ID: v.ladeuil+lp@free.fr-20110610081144-9g1gppbjok4z8mxf
Nitpicks.

Show diffs side-by-side

added added

removed removed

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