Rev 5978: (jameinel) Fix bug #798130, if a file changes case on a cicp filesystem, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5978 [merge]
revision-id: pqm at pqm.ubuntu.com-20110616141511-np6z47o7473dgjsp
parent: pqm at pqm.ubuntu.com-20110616075128-g8hdusp4sr0bwipz
parent: john at arbash-meinel.com-20110616132823-awdep2s8bt1ib4a3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-06-16 14:15:11 +0000
message:
  (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)
modified:
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py	2011-05-20 15:27:35 +0000
+++ b/bzrlib/mutabletree.py	2011-06-16 13:28:23 +0000
@@ -554,6 +554,8 @@
         entry = self._invdelta.get(inv_path)
         if entry is not None:
             return entry[3]
+        # Find a 'best fit' match if the filesystem is case-insensitive
+        inv_path = self.tree._fix_case_of_inventory_path(inv_path)
         file_id = self.tree.path2id(inv_path)
         if file_id is not None:
             return self.tree.iter_entries_by_dir([file_id]).next()[1]

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-06-16 07:51:28 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-06-16 11:45:29 +0000
@@ -85,6 +85,9 @@
   because ``build_mo`` became a required step that they didn't know about.
   (John Arbash Meinel, #787122)
 
+* Properly avoid re-adding a file after it changes case on CICP
+  filesystems. (John Arbash Meinel, #798130)
+
 * Reports the original error when an InvalidHttpResponse exception is
   encountered to facilitate debug. (Vincent Ladeuil, #788530)