← 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: 2006-04-12 06:22:44 UTC
  • mfrom: (1558.12.10 fix-mergesums)
  • Revision ID: pqm@pqm.ubuntu.com-20060412062244-b1ea5860b8463060
Minor bugfixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
637
637
            raise MergeModifiedFormatError()
638
638
        for s in RioReader(hashfile):
639
639
            file_id = s.get("file_id")
 
640
            if file_id not in self.inventory:
 
641
                continue
640
642
            hash = s.get("hash")
641
643
            if hash == self.get_file_sha1(file_id):
642
644
                merge_hashes[file_id] = hash