← 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

(Martin <gz>) Use get_bytes() to ensure that read bundles get closed
        properly.

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_reversed_revision_range(self):
 
593
        tree = self.make_branch_and_tree(".")
 
594
        for f in ("a", "b"):
 
595
            self.build_tree([f])
 
596
            tree.add(f)
 
597
            tree.commit("added "+f)
 
598
        for context in (".", "", "a"):
 
599
            self.run_bzr("merge -r 1..0 " + context)
 
600
            self.failIfExists("a")
 
601
            tree.revert()
 
602
            self.failUnlessExists("a")
 
603
 
592
604
 
593
605
class TestMergeForce(tests.TestCaseWithTransport):
594
606