/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-10-15 16:41:48 UTC
  • mfrom: (5502.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101015164148-k10lo687r72nzbtl
(vila) Provides a ``bzr.transform.orphan_policy`` option to control
        orphan handling when merging directory deletion (Vincent Ladeuil)

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.