/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-04-12 05:50:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1655.
  • Revision ID: aaron.bentley@utoronto.ca-20060412055057-a0679e57841da975
Be robust when merge_hash file_id not in inventory

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