← 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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
74
74
 
75
75
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
76
76
        # when upgrading a checkout, the branch location and a suggestion
77
 
        # to upgrade it should be emitted even if the checkout is up to 
 
77
        # to upgrade it should be emitted even if the checkout is up to
78
78
        # date
79
79
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
80
80
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
90
90
        pass
91
91
 
92
92
    def test_upgrade_repository_scans_branches(self):
93
 
        # we should get individual upgrade notes for each branch even the 
 
93
        # we should get individual upgrade notes for each branch even the
94
94
        # anonymous branch
95
95
        pass
96
96
 
120
120
            bzrdir.BzrDirMetaFormat1))
121
121
 
122
122
    def test_upgrade_explicit_knit(self):
123
 
        # users can force an upgrade to knit format from a metadir weave 
 
123
        # users can force an upgrade to knit format from a metadir weave
124
124
        # branch
125
125
        url = get_transport(self.get_url('metadir_weave_branch')).base
126
126
        # check --format takes effect