← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
19
19
 
20
20
import bzrlib
21
21
import bzrlib.bzrdir as bzrdir
 
22
from bzrlib.inventory import Inventory
22
23
import bzrlib.repository as repository
23
24
from bzrlib.tests import TestCaseWithTransport
24
25
from bzrlib.tests.blackbox import TestUIFactory
51
52
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
52
53
        # an empty inventory with no revision will trigger reconciliation.
53
54
        repo = t.branch.repository
54
 
        inv = bzrlib.tree.EmptyTree().inventory
 
55
        inv = Inventory()
55
56
        repo.add_inventory('missing', inv, [])
56
57
        (out, err) = self.run_bzr_captured(['reconcile'])
57
58
        self.assertEqualDiff(out, "Reconciling repository %s\n"