← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

Merge thread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
724
724
 
725
725
    def test_from_revision_ids(self):
726
726
        this, other = self.set_up_trees()
727
 
        self.assertRaises(errors.RevisionNotPresent, Merger.from_revision_ids,
 
727
        self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids,
728
728
                          progress.DummyProgress(), this, 'rev2b')
729
729
        this.lock_write()
730
730
        self.addCleanup(this.unlock)