Rev 5418: Fix renaming missed by the merge. in file:///home/vila/src/bzr/bugs/323111-orphans/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Sep 9 15:13:34 BST 2010


At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5418
revision-id: v.ladeuil+lp at free.fr-20100909141334-mrdt8dya6hrcbu0a
parent: v.ladeuil+lp at free.fr-20100909134152-8ieubk6vfi561zqe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Thu 2010-09-09 16:13:34 +0200
message:
  Fix renaming missed by the merge.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-09-09 08:14:39 +0000
+++ b/bzrlib/transform.py	2010-09-09 14:13:34 +0000
@@ -1291,7 +1291,7 @@
         if self.final_kind(od_id) is None:
             self.create_directory(od_id)
         # Find a name that doesn't exist yet in the orphan dir
-        new_name = osutils.generate_backup_name(
+        new_name = osutils.available_backup_name(
             self.final_name(trans_id), lambda name: name in self._tree_path_ids)
         self.adjust_path(new_name, od_id, trans_id)
 



More information about the bazaar-commits mailing list