← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
27
27
from bzrlib.bundle.serializer import write_bundle, read_bundle
28
28
from bzrlib.branch import Branch
29
29
from bzrlib.diff import internal_diff
30
 
from bzrlib.delta import compare_trees
31
30
from bzrlib.errors import BzrError, TestamentMismatch, NotABundle, BadBundle
32
31
from bzrlib.merge import Merge3Merger
33
32
from bzrlib.osutils import has_symlinks, sha_file
403
402
            new = tree.branch.repository.revision_tree(ancestor)
404
403
 
405
404
            # Check that there aren't any inventory level changes
406
 
            delta = compare_trees(old, new)
 
405
            delta = new.changes_from(old)
407
406
            self.assertFalse(delta.has_changed(),
408
407
                             'Revision %s not copied correctly.'
409
408
                             % (ancestor,))
422
421
            rh = self.b1.revision_history()
423
422
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
424
423
            tree.update()
425
 
            delta = compare_trees(self.b1.repository.revision_tree(rev_id),
426
 
                                  tree)
 
424
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
427
425
            self.assertFalse(delta.has_changed(),
428
426
                             'Working tree has modifications')
429
427
        return tree