← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fileid_involved.py

Merge from jam-integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fileid_involved.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.tests import TestCaseInTempDir
18
17
import os
19
 
from bzrlib.commit import commit
 
18
 
20
19
from bzrlib.add import smart_add
21
20
from bzrlib.branch import Branch
22
 
from bzrlib.merge import merge
 
21
from bzrlib.builtins import merge
 
22
from bzrlib.commit import commit
 
23
from bzrlib.delta import compare_trees
 
24
from bzrlib.tests import TestCaseInTempDir
23
25
from bzrlib.workingtree import WorkingTree
24
 
from bzrlib.delta import compare_trees
25
26
 
26
27
 
27
28
class TestFileIdInvolved(TestCaseInTempDir):
32
33
        f.close( )
33
34
 
34
35
    def merge( self, branch_from, force=False ):
35
 
        from bzrlib.merge_core import ApplyMerge3
 
36
        from bzrlib._merge_core import ApplyMerge3
36
37
 
37
38
        merge([branch_from,-1],[None,None], merge_type=ApplyMerge3,
38
39
            check_clean=(not force) )