~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

Resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
68
68
 
69
69
    def _backup_control_dir(self):
70
70
        self.pb.note('making backup of tree history')
71
 
        self.transport.copy_tree('.bzr', '.bzr.backup')
72
 
        self.pb.note('%s.bzr has been backed up to %s.bzr.backup',
 
71
        self.transport.copy_tree('.bzr', 'backup.bzr')
 
72
        self.pb.note('%s.bzr has been backed up to %sbackup.bzr',
73
73
             self.transport.base,
74
74
             self.transport.base)
75
75
        self.pb.note('if conversion fails, you can move this directory back to .bzr')