← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

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
229
227
        transaction = self.repo.get_transaction()
230
228
        self.pb.update('Reading inventory data')
231
229
        self.inventory = self.repo.inventories