← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Martin Pool
  • Date: 2009-07-27 05:38:00 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727053800-bgnhmzzgo0u0314s
Remove tests for deleted LockableFiles methods

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib import check, osutils
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
24
21
from bzrlib.tests import (
25
22
    SymlinkFeature,
26
23
    TestCaseWithTransport,
27
24
    )
 
25
from bzrlib.branch import Branch
 
26
from bzrlib.errors import PointlessCommit, BzrError
28
27
from bzrlib.tests.test_revision import make_branches
 
28
from bzrlib import osutils
29
29
 
30
30
 
31
31
class TestCommitMerge(TestCaseWithTransport):
96
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
98
 
99
 
        check.check_dwim(bx.base, False, True, True)
100
 
        check.check_dwim(by.base, False, True, True)
 
99
        bx.check()
 
100
        by.check()
 
101
        bx.repository.check([bx.last_revision()])
 
102
        by.repository.check([by.last_revision()])
101
103
 
102
104
    def test_merge_with_symlink(self):
103
105
        self.requireFeature(SymlinkFeature)