← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Fix renaming missed by the merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1291
1291
        if self.final_kind(od_id) is None:
1292
1292
            self.create_directory(od_id)
1293
1293
        # Find a name that doesn't exist yet in the orphan dir
1294
 
        new_name = osutils.generate_backup_name(
 
1294
        new_name = osutils.available_backup_name(
1295
1295
            self.final_name(trans_id), lambda name: name in self._tree_path_ids)
1296
1296
        self.adjust_path(new_name, od_id, trans_id)
1297
1297