/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

merge bzr.dev into cleanup

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
 
 
600
    def test_merge_reversed_revision_range(self):
 
601
        tree = self.make_branch_and_tree(".")
 
602
        for f in ("a", "b"):
 
603
            self.build_tree([f])
 
604
            tree.add(f)
 
605
            tree.commit("added "+f)
 
606
        for context in (".", "", "a"):
 
607
            self.run_bzr("merge -r 1..0 " + context)
 
608
            self.failIfExists("a")
 
609
            tree.revert()
 
610
            self.failUnlessExists("a")
 
611
 
592
612
 
593
613
class TestMergeForce(tests.TestCaseWithTransport):
594
614