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

  • Committer: Max Bowsher
  • Date: 2011-02-02 14:33:27 UTC
  • mfrom: (5050.62.6 2.2)
  • mto: (5609.2.7 2.3)
  • mto: This revision was merged to the branch mainline in revision 5642.
  • Revision ID: maxb@f2s.com-20110202143327-mnplbp52i25y2mo2
https://launchpad.net/bugs/707075
Merge 2.2 into 2.3 for lp:707075. Also sync up doc/en/release-notes/bzr-2.2.txt
with bzr 2.2's NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
78
78
    branch_format = control.find_branch_format()
79
79
    if branch_format.get_reference(control) is not None:
80
80
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
81
        branch_format.set_reference(control, None, to_branch)
82
82
    else:
83
83
        b = control.open_branch()
84
84
        bound_branch = b.get_bound_location()