← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

  • Committer: Aaron Bentley
  • Date: 2011-06-10 18:35:04 UTC
  • mto: (5954.6.3 795456-eager-test)
  • mto: This revision was merged to the branch mainline in revision 5968.
  • Revision ID: aaron@aaronbentley.com-20110610183504-kqjj7bik4fngllnt
Updates from review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
312
312
        tree1.merge_from_branch(tree2.branch,
313
313
                                from_revision=revision.NULL_REVISION)
314
314
        tree1.commit('Replaced root entry')
315
 
        self.shelve_all(tree1, rev2)
316
315
        # This is essentially assertNotRaises(InconsistentDelta)
317
316
        with ExpectedException(AssertionError,
318
317
                               'InconsistentDelta not raised'):