← 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: 2010-05-28 00:25:32 UTC
  • mfrom: (5264.1.2 command-help-bug-177500)
  • Revision ID: pqm@pqm.ubuntu.com-20100528002532-9bzj1fajyxckd1rg
(lifeless) Stop raising at runtime when a command has no help,
 instead have a test in the test suite that checks all known command objects.
 (Robert Collins)

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)