~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-01 23:48:08 UTC
  • mfrom: (2225.1.6 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
Display changes made by revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
52
52
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
53
53
        # an empty inventory with no revision will trigger reconciliation.
54
54
        repo = t.branch.repository
55
 
        inv = Inventory()
 
55
        inv = Inventory(revision_id='missing')
 
56
        inv.root.revision='missing'
56
57
        repo.add_inventory('missing', inv, [])
57
58
        (out, err) = self.run_bzr_captured(['reconcile'])
58
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"