Rev 2310: Properly determine file ids of children of directories that are replaced by an older copy of themselves. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2310
revision-id: jelmer at samba.org-20090115042145-4ohdyzagq85zwod5
parent: jelmer at samba.org-20090115021855-3255b4v3azy2zkqo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Thu 2009-01-15 05:21:45 +0100
message:
  Properly determine file ids of children of directories that are replaced by an older copy of themselves.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'NEWS'
--- a/NEWS	2009-01-14 18:55:15 +0000
+++ b/NEWS	2009-01-15 04:21:45 +0000
@@ -43,6 +43,9 @@
 
    * No longer includes subvertpy, but rather depends on external installation.
 
+   * Properly determine file ids of children of directories that are replaced 
+     by an older copy of themselves. (#316384)
+
 bzr-svn 0.5.0~rc1			2008-12-08
 
   CHANGES

=== modified file 'fetch.py'
--- a/fetch.py	2009-01-15 02:18:55 +0000
+++ b/fetch.py	2009-01-15 04:21:45 +0000
@@ -614,7 +614,13 @@
         ret = self._get_id_map().get(path)
         if ret is not None:
             return ret
-        return self._get_old_id(old_parent_id, path)
+        # If there was no explicit mention of this file id in the map, then 
+        # this file_id can only stay the same if the parent file id 
+        # didn't change
+        if old_parent_id == new_parent_id:
+            return self._get_old_id(old_parent_id, path)
+        else:
+            return self._get_new_id(path)
 
     def _get_new_id(self, new_path):
         assert isinstance(new_path, unicode)