← 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

  • Committer: Vincent Ladeuil
  • Date: 2012-08-01 09:27:40 UTC
  • mfrom: (6437.63.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6549.
  • Revision ID: v.ladeuil+lp@free.fr-20120801092740-rhcwpdylg14ojvrq
Merge 2.5 including fix for bug #957049

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
18
18
 
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
 
21
    controldir,
22
22
    inventory,
23
23
    tests,
24
24
    )
28
28
class TrivialTest(tests.TestCaseWithTransport):
29
29
 
30
30
    def test_trivial_reconcile(self):
31
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
31
        t = controldir.ControlDir.create_standalone_workingtree('.')
32
32
        (out, err) = self.run_bzr('reconcile')
33
33
        if t.branch.repository._reconcile_backsup_inventory:
34
34
            does_backup_text = "Inventory ok.\n"
45
45
        self.assertEqualDiff(err, "")
46
46
 
47
47
    def test_does_something_reconcile(self):
48
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
48
        t = controldir.ControlDir.create_standalone_workingtree('.')
49
49
        # an empty inventory with no revision will trigger reconciliation.
50
50
        repo = t.branch.repository
51
51
        inv = inventory.Inventory(revision_id='missing')