← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Marius Kruger
  • Date: 2008-10-03 20:57:44 UTC
  • mto: This revision was merged to the branch mainline in revision 3809.
  • Revision ID: amanic@gmail.com-20081003205744-o0cdopyj7mum2dkw
* checkouts now use master nick when no explicit nick is set.
* switch updates only explicit nicks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4599
4599
            to_branch = Branch.open(
4600
4600
                urlutils.join(this_url, '..', to_location))
4601
4601
        switch.switch(control_dir, to_branch, force)
4602
 
        branch.nick = to_branch.nick
 
4602
        if branch.get_config().has_explicit_nickname():
 
4603
            branch = control_dir.open_branch() #get the new branch!
 
4604
            branch.nick = to_branch.nick
4603
4605
        note('Switched to branch: %s',
4604
4606
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4605
4607