← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-06 09:10:02 UTC
  • mfrom: (5816.6.19 bazaar_source)
  • Revision ID: pqm@pqm.ubuntu.com-20110506091002-ge55v96dgz9hfz67
(vila) Set correct parent when using 'switch -b' with bound branches (Fix
 for Bug #513709). (Dr Al)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
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.')