← 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-01-21 22:45:45 UTC
  • mfrom: (5628.1.1 locale-failure)
  • Revision ID: pqm@pqm.ubuntu.com-20110121224545-j7ie4ubrplzw0tvv
(jelmer) Fix test_locale test on systems where the default locale is not C.
 (Jelmer Vernooij)

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())
107
106
        else:
108
107
            raise errors.BzrCommandError('Cannot switch a branch, '
109
108
                'only a checkout.')