← Back to branch summary

~thumper/bzr/alias-command

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Tim Penhey
  • Date: 2008-04-20 08:48:04 UTC
  • mfrom: (2900.1.474 +trunk)
  • Revision ID: tim@penhey.net-20080420084804-fw6m8ezw4n7pnmo1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
458
458
        file.close()
459
459
        mary_tree.commit("change file2")
460
460
        # john should be able to merge with no conflicts.
461
 
        merge_type = Merge3Merger
462
461
        base = [None, None]
463
462
        other = ("mary", -1)
464
463
        tree.merge_from_branch(mary_tree.branch)
725
724
        this, other = self.set_up_trees()
726
725
        self.assertRaises(errors.RevisionNotPresent, Merger.from_revision_ids,
727
726
                          progress.DummyProgress(), this, 'rev2b')
 
727
        this.lock_write()
 
728
        self.addCleanup(this.unlock)
728
729
        merger = Merger.from_revision_ids(progress.DummyProgress(), this,
729
730
            'rev2b', other_branch=other.branch)
730
731
        self.assertEqual('rev2b', merger.other_rev_id)
743
744
    def test_from_mergeable(self):
744
745
        this, other = self.set_up_trees()
745
746
        other.commit('rev3', rev_id='rev3')
 
747
        this.lock_write()
 
748
        self.addCleanup(this.unlock)
746
749
        md = merge_directive.MergeDirective2.from_objects(
747
750
            other.branch.repository, 'rev3', 0, 0, 'this')
 
751
        other.lock_read()
 
752
        self.addCleanup(other.unlock)
748
753
        merger, verified = Merger.from_mergeable(this, md,
749
754
            progress.DummyProgress())
750
755
        md.patch = None