← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-04 03:56:20 UTC
  • mfrom: (3519.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080704035620-zy61drff8onhjxno
Fix check to understand split up .bzr format (Daniel Mark Watkins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2453
2453
        self.set_conflicts(un_resolved)
2454
2454
        return un_resolved, resolved
2455
2455
 
 
2456
    @needs_read_lock
 
2457
    def _check(self):
 
2458
        tree_basis = self.basis_tree()
 
2459
        tree_basis.lock_read()
 
2460
        try:
 
2461
            repo_basis = self.branch.repository.revision_tree(
 
2462
                self.last_revision())
 
2463
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
 
2464
                raise errors.BzrCheckError(
 
2465
                    "Mismatched basis inventory content.")
 
2466
            self._validate()
 
2467
        finally:
 
2468
            tree_basis.unlock()
 
2469
 
2456
2470
    def _validate(self):
2457
2471
        """Validate internal structures.
2458
2472