← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-12 03:57:26 UTC
  • mfrom: (2745.6.62 reconcile-check-heads)
  • Revision ID: pqm@pqm.ubuntu.com-20071012035726-d8e3stq343fqi0bz
(Andrew Bennetts, Aaron Bentley) Reconcile can fix bad parent references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
570
570
        if t in checker.checked_texts:
571
571
            prev_sha = checker.checked_texts[t]
572
572
            if prev_sha != self.text_sha1:
573
 
                raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
574
 
                                    (self.file_id, tree_revision_id))
 
573
                raise BzrCheckError(
 
574
                    'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
 
575
                    (self.file_id, tree_revision_id, prev_sha, self.text_sha1,
 
576
                     t))
575
577
            else:
576
578
                checker.repeated_text_cnt += 1
577
579
                return