← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Max Bowsher
  • Date: 2012-08-08 11:44:19 UTC
  • mfrom: (6552 +trunk)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: _@maxb.eu-20120808114419-hes7at3ihv3mwi16
Merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
68
68
    :param location: the url of the destination
69
69
    :param to_file: the output stream
70
70
    :param verbose: if True, display more output than normal
71
 
    :param overwrite: if False, a current branch at the destination may not
72
 
        have diverged from the source, otherwise the push fails
 
71
    :param overwrite: list of things to overwrite ("history", "tags")
 
72
        or boolean indicating for everything
73
73
    :param remember: if True, store the location as the push location for
74
74
        the source branch
75
75
    :param stacked_on: the url of the branch, if any, to stack on;