← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_fileid_involved.py

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_fileid_involved.py
20
20
from bzrlib.add import smart_add
21
21
from bzrlib.builtins import merge
22
22
from bzrlib.errors import IllegalPath
23
 
from bzrlib.delta import compare_trees
24
23
from bzrlib.tests import TestSkipped
25
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
26
25
from bzrlib.transform import TreeTransform
37
36
    def compare_tree_fileids(self, branch, old_rev, new_rev):
38
37
        old_tree = self.branch.repository.revision_tree(old_rev)
39
38
        new_tree = self.branch.repository.revision_tree(new_rev)
40
 
        delta = compare_trees(old_tree, new_tree)
 
39
        delta = new_tree.changes_from(old_tree)
41
40
 
42
41
        l2 = [id for path, id, kind in delta.added] + \
43
42
             [id for oldpath, newpath, id, kind, text_modified, \