← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Martin
  • Date: 2011-08-04 00:17:53 UTC
  • mto: This revision was merged to the branch mainline in revision 6055.
  • Revision ID: gzlist@googlemail.com-20110804001753-plgpwcpsxcum16yb
Make tests raising KnownFailure use the knownFailure method instead

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()
103
103
            b.pull(to_branch, overwrite=True,
104
104
                possible_transports=possible_transports)
105
105
            b.set_bound_location(to_branch.base)
 
106
            b.set_parent(b.get_master_branch().get_parent())
106
107
        else:
107
108
            raise errors.BzrCommandError('Cannot switch a branch, '
108
109
                'only a checkout.')