← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
57
57
 
58
58
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
59
59
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
60
 
    use_existing_dir=False):
 
60
    use_existing_dir=False, no_tree=False):
61
61
    """Push a branch to a location.
62
62
 
63
63
    :param br_from: the source branch
87
87
        try:
88
88
            br_to = br_from.create_clone_on_transport(to_transport,
89
89
                revision_id=revision_id, stacked_on=stacked_on,
90
 
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
 
90
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
 
91
                no_tree=no_tree)
91
92
        except errors.FileExists, err:
92
93
            if err.path.endswith('/.bzr'):
93
94
                raise errors.BzrCommandError(