/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/mutabletree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-16 14:15:11 UTC
  • mfrom: (5977.1.3 2.4-cicp-add-798130)
  • Revision ID: pqm@pqm.ubuntu.com-20110616141511-np6z47o7473dgjsp
(jameinel) Fix bug #798130, if a file changes case on a cicp filesystem,
 don't treat it as a new file in 'bzr add' (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
554
554
        entry = self._invdelta.get(inv_path)
555
555
        if entry is not None:
556
556
            return entry[3]
 
557
        # Find a 'best fit' match if the filesystem is case-insensitive
 
558
        inv_path = self.tree._fix_case_of_inventory_path(inv_path)
557
559
        file_id = self.tree.path2id(inv_path)
558
560
        if file_id is not None:
559
561
            return self.tree.iter_entries_by_dir([file_id]).next()[1]