← 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: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

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