Rev 5964: No test fails without this change. in file:///home/vila/src/bzr/reviews/merge-into-empty/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/merge-into-empty/

------------------------------------------------------------
revno: 5964
revision-id: v.ladeuil+lp at free.fr-20110610110002-zw8tfbx8652rsaz7
parent: v.ladeuil+lp at free.fr-20110610102558-8f7qlq15lw08plrn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-into-empty
timestamp: Fri 2011-06-10 13:00:02 +0200
message:
  No test fails without this change.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2011-06-09 18:56:55 +0000
+++ b/bzrlib/transform.py	2011-06-10 11:00:02 +0000
@@ -252,8 +252,7 @@
         if (self.tree_file_id(self._new_root) is not None and
             self._new_root not in self._removed_id):
             self.unversion_file(self._new_root)
-        if file_id is not None:
-            self.version_file(file_id, self._new_root)
+        self.version_file(file_id, self._new_root)
 
         # Now move children of new root into old root directory.
         # Ensure all children are registered with the transaction, but don't