← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-08 11:35:49 UTC
  • mfrom: (5531.1.3 662509-ignore-empty)
  • Revision ID: pqm@pqm.ubuntu.com-20101108113549-e4mhhq2fe1i0etbf
(vila) Add an option to accept any output from commands in shell-like tests.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
224
224
        only data-loss causing issues (!self.thorough) or all issues
225
225
        (self.thorough) are treated as requiring the reweave.
226
226
        """
 
227
        # local because needing to know about WeaveFile is a wart we want to hide
 
228
        from bzrlib.weave import WeaveFile, Weave
227
229
        transaction = self.repo.get_transaction()
228
230
        self.pb.update('Reading inventory data')
229
231
        self.inventory = self.repo.inventories