/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/builtins.py

  • Committer: Adrian Wilkins
  • Date: 2008-08-07 09:12:47 UTC
  • mto: (3714.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 3716.
  • Revision ID: adrian.wilkins@gmail.com-20080807091247-ka2b7thkrsap69jr
Improved comments and documentation
Used urlutils.join to join the url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4482
4482
            to_branch = Branch.open(to_location)
4483
4483
        except errors.NotBranchError:
4484
4484
            this_branch = control_dir.open_branch()
 
4485
            # This may be a heavy checkout, where we want the master branch
4485
4486
            this_url = this_branch.get_bound_location()
4486
 
            # This might be a heavyweight checkout
 
4487
            # If not, use a local sibling
4487
4488
            if this_url is None:
4488
4489
                this_url = this_branch.base
4489
4490
            to_branch = Branch.open(
4490
 
                this_url + '../' + to_location)
 
4491
                urlutils.join(this_url, '..', to_location))
4491
4492
        switch.switch(control_dir, to_branch, force)
4492
4493
        note('Switched to branch: %s',
4493
4494
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))