← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Aaron Bentley
  • Date: 2006-03-18 23:40:51 UTC
  • mto: This revision was merged to the branch mainline in revision 1615.
  • Revision ID: aaron.bentley@utoronto.ca-20060318234051-415e5fcb51da82e4
Allow merge against self, make fetching self a noop

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
40
40
            self.pb.finished()
41
41
 
42
42
    def convert(self):
43
 
        try:
44
 
            branch = self.bzrdir.open_branch()
45
 
            if branch.bzrdir.root_transport.base != \
46
 
                self.bzrdir.root_transport.base:
47
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
48
 
                             "upgraded separately.",
49
 
                             branch.bzrdir.root_transport.base)
50
 
        except errors.NotBranchError:
51
 
            pass
 
43
        branch = self.bzrdir.open_branch()
 
44
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
 
45
            self.pb.note("This is a checkout. The branch (%s) needs to be "
 
46
                         "upgraded separately.",
 
47
                         branch.bzrdir.root_transport.base)
52
48
        if not self.bzrdir.needs_format_conversion(self.format):
53
49
            raise errors.UpToDateFormat(self.bzrdir._format)
54
50
        if not self.bzrdir.can_convert_format():