← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-07 22:32:56 UTC
  • mfrom: (4832.2.2 merge-i-lock)
  • Revision ID: pqm@pqm.ubuntu.com-20091207223256-9e6l1vc6h3jc2eqs
(abentley) merge -i doesn't leave branches write-locked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
589
589
        self.run_bzr('merge -d this other -r0..')
590
590
        self.failUnlessExists('this/other_file')
591
591
 
 
592
    def test_merge_interactive_unlocks_branch(self):
 
593
        this = self.make_branch_and_tree('this')
 
594
        other = self.make_branch_and_tree('other')
 
595
        other.commit('empty commit')
 
596
        self.run_bzr('merge -i -d this other')
 
597
        this.lock_write()
 
598
        this.unlock()
 
599
 
592
600
    def test_merge_reversed_revision_range(self):
593
601
        tree = self.make_branch_and_tree(".")
594
602
        for f in ("a", "b"):