← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-15 15:05:09 UTC
  • mfrom: (5409.1.25 orphan-config-option)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20101015150509-cigmjyo1florh3d7
Merge lp:~vila/bzr/323111-orphan-config-option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2080
2080
                    files_to_backup.append(path[1])
2081
2081
 
2082
2082
        def backup(file_to_backup):
2083
 
            backup_name = self.bzrdir.generate_backup_name(file_to_backup)
 
2083
            backup_name = self.bzrdir._available_backup_name(file_to_backup)
2084
2084
            osutils.rename(abs_path, self.abspath(backup_name))
2085
 
            return "removed %s (but kept a copy: %s)" % (file_to_backup, backup_name)
 
2085
            return "removed %s (but kept a copy: %s)" % (file_to_backup,
 
2086
                                                         backup_name)
2086
2087
 
2087
2088
        # Build inv_delta and delete files where applicable,
2088
2089
        # do this before any modifications to inventory.