← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_reconcile.py
19
19
 
20
20
import bzrlib
21
21
import bzrlib.errors as errors
 
22
from bzrlib.inventory import Inventory
22
23
from bzrlib.reconcile import reconcile, Reconciler
23
24
from bzrlib.revision import Revision
24
25
from bzrlib.tests import TestSkipped
25
26
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
26
27
from bzrlib.transport import get_transport
27
 
from bzrlib.tree import EmptyTree
28
28
from bzrlib.uncommit import uncommit
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
56
56
        t = get_transport(self.get_url())
57
57
        # an empty inventory with no revision for testing with.
58
58
        repo = self.make_repository('inventory_without_revision')
59
 
        inv = EmptyTree().inventory
 
59
        inv = Inventory()
60
60
        repo.add_inventory('missing', inv, [])
61
61
 
62
62
        # an empty inventory with no revision for testing with.
64
64
        # that all the cached data is correctly converted into ghost links
65
65
        # and the referenced inventory still cleaned.
66
66
        repo = self.make_repository('inventory_without_revision_and_ghost')
67
 
        inv = EmptyTree().inventory
 
67
        inv = Inventory()
68
68
        repo.add_inventory('missing', inv, [])
69
69
        sha1 = repo.add_inventory('references_missing', inv, ['missing'])
70
70
        rev = Revision(timestamp=0,
265
265
 
266
266
        # now setup the wrong-first parent case
267
267
        repo = tree.branch.repository
268
 
        inv = EmptyTree().inventory
 
268
        inv = Inventory()
269
269
        sha1 = repo.add_inventory('wrong-first-parent', inv, ['2', '1'])
270
270
        rev = Revision(timestamp=0,
271
271
                       timezone=None,
278
278
 
279
279
        # now setup the wrong-secondary parent case
280
280
        repo = repo_secondary
281
 
        inv = EmptyTree().inventory
 
281
        inv = Inventory()
282
282
        sha1 = repo.add_inventory('wrong-secondary-parent', inv, ['1', '3', '2'])
283
283
        rev = Revision(timestamp=0,
284
284
                       timezone=None,