← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_upgrade.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
109
109
            ['upgrade', '--format=metaweave', url])
110
110
        self.assertEqualDiff("""starting upgrade of %s
111
111
making backup of tree history
112
 
%s.bzr has been backed up to %s.bzr.backup
 
112
%s.bzr has been backed up to %sbackup.bzr
113
113
if conversion fails, you can move this directory back to .bzr
114
114
if it succeeds, you can remove this directory if you wish
115
115
starting upgrade from format 5 to 6
133
133
            ['upgrade', '--format=knit', url])
134
134
        self.assertEqualDiff("""starting upgrade of %s
135
135
making backup of tree history
136
 
%s.bzr has been backed up to %s.bzr.backup
 
136
%s.bzr has been backed up to %sbackup.bzr
137
137
if conversion fails, you can move this directory back to .bzr
138
138
if it succeeds, you can remove this directory if you wish
139
139
starting repository conversion
172
172
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
173
173
        self.assertEqualDiff("""starting upgrade of %s
174
174
making backup of tree history
175
 
%s.bzr has been backed up to %s.bzr.backup
 
175
%s.bzr has been backed up to %sbackup.bzr
176
176
if conversion fails, you can move this directory back to .bzr
177
177
if it succeeds, you can remove this directory if you wish
178
178
starting upgrade from format 6 to metadir