/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
47
47
    def convert(self):
48
48
        try:
49
49
            branch = self.bzrdir.open_branch()
50
 
            if branch.bzrdir.root_transport.base != \
51
 
                self.bzrdir.root_transport.base:
 
50
            if branch.user_url != self.bzrdir.user_url:
52
51
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
53
52
                             "upgraded separately." %
54
 
                             branch.bzrdir.root_transport.base)
 
53
                             branch.user_url)
55
54
            del branch
56
55
        except (errors.NotBranchError, errors.IncompatibleRepositories):
57
56
            # might not be a format we can open without upgrading; see e.g.