← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Max Bowsher
  • Date: 2011-01-11 11:26:48 UTC
  • mto: This revision was merged to the branch mainline in revision 5589.
  • Revision ID: maxb@f2s.com-20110111112648-3lleuo22utyaunfw
Add a consistent header comment to tools/packaging/*.sh

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