← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
33
33
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
34
34
    """Switch the branch associated with a checkout.
35
35
 
36
 
    :param control_dir: BzrDir of the checkout to change
 
36
    :param control_dir: ControlDir of the checkout to change
37
37
    :param to_branch: branch that the checkout is to reference
38
38
    :param force: skip the check for local commits in a heavy checkout
39
39
    :param revision_id: revision ID to switch to.
51
51
def _check_pending_merges(control, force=False):
52
52
    """Check that there are no outstanding pending merges before switching.
53
53
 
54
 
    :param control: BzrDir of the branch to check
 
54
    :param control: ControlDir of the branch to check
55
55
    """
56
56
    try:
57
57
        tree = control.open_workingtree()
71
71
def _set_branch_location(control, to_branch, force=False):
72
72
    """Set location value of a branch reference.
73
73
 
74
 
    :param control: BzrDir of the checkout to change
 
74
    :param control: ControlDir of the checkout to change
75
75
    :param to_branch: branch that the checkout is to reference
76
76
    :param force: skip the check for local commits in a heavy checkout
77
77
    """