← 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: Marius Kruger
  • Date: 2007-06-27 18:48:10 UTC
  • mfrom: (2557 +trunk)
  • mto: (2605.1.1 rm-renamed)
  • mto: This revision was merged to the branch mainline in revision 2609.
  • Revision ID: marius.kruger@enerweb.co.za-20070627184810-4jq1y5f20xafow9w
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
41
41
 
42
42
    def test_trivial_reconcile(self):
43
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
44
 
        (out, err) = self.run_bzr_captured(['reconcile'])
 
44
        (out, err) = self.run_bzr(['reconcile'])
45
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
46
46
                                  "Inventory ok.\n"
47
47
                                  "Reconciliation complete.\n" %
55
55
        inv = Inventory(revision_id='missing')
56
56
        inv.root.revision='missing'
57
57
        repo.add_inventory('missing', inv, [])
58
 
        (out, err) = self.run_bzr_captured(['reconcile'])
 
58
        (out, err) = self.run_bzr(['reconcile'])
59
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"
60
60
                                  "Backup Inventory created.\n"
61
61
                                  "Inventory regenerated.\n"