Rev 1179: Fix dealing with strange remove during replace operation. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 1179
revision-id: jelmer at samba.org-20080521194016-ijaq8upw7jq4ptll
parent: jelmer at samba.org-20080518152416-927461jrkz37ln8j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-05-21 21:40:16 +0200
message:
  Fix dealing with strange remove during replace operation.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'NEWS'
--- a/NEWS	2008-05-15 02:58:16 +0000
+++ b/NEWS	2008-05-21 19:40:16 +0000
@@ -15,6 +15,8 @@
 
    * Cope with kind changes better. (#191576)
 
+   * Fix dealing with strange remove during replace operation. (#232196)
+
 bzr-svn 0.4.10  2008-05-12
 
   CHANGES

=== modified file 'fetch.py'
--- a/fetch.py	2008-05-15 20:03:18 +0000
+++ b/fetch.py	2008-05-21 19:40:16 +0000
@@ -173,7 +173,8 @@
         ret = self._get_id_map().get(new_path)
         if ret is not None:
             return ret
-        return self.mapping.generate_file_id(self.source.uuid, self.revnum, self.branch_path, new_path)
+        return self.mapping.generate_file_id(self.source.uuid, self.revnum, 
+                                             self.branch_path, new_path)
 
     def _rename(self, file_id, parent_id, path):
         assert isinstance(path, unicode)
@@ -194,7 +195,7 @@
                 if p.startswith("%s/" % path):
                     self._premature_deletes.remove(p)
         else:
-            self.inventory.remove_recursive_id(self._get_old_id(new_parent_id, path))
+            self.inventory.remove_recursive_id(self._get_old_id(old_parent_id, path))
 
     def close_directory(self, (old_id, new_id)):
         self.inventory[new_id].revision = self.revid