← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/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/upgrade.py
53
53
                             branch.bzrdir.root_transport.base)
54
54
            del branch
55
55
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
 
            # might not be a format we can open without upgrading; see e.g. 
 
56
            # might not be a format we can open without upgrading; see e.g.
57
57
            # https://bugs.launchpad.net/bzr/+bug/253891
58
58
            pass
59
59
        if not self.bzrdir.needs_format_conversion(self.format):