← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
125
125
                    "already exists at the destination location.")
126
126
        try:
127
127
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
128
 
                remember)
 
128
                remember, create_prefix)
129
129
        except errors.DivergedBranches:
130
130
            raise errors.BzrCommandError('These branches have diverged.'
131
131
                                    '  See "bzr help diverged-branches"'