Rev 4547: (Jelmer) Pass create_prefix parameter to BzrDir.push_branch. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4547 [merge]
revision-id: pqm at pqm.ubuntu.com-20090718221133-pcte28e3my3qv7ni
parent: pqm at pqm.ubuntu.com-20090717080247-n5v1xoopaommebu3
parent: jelmer at samba.org-20090718210900-oht5snx25j1jyeha
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-07-18 23:11:33 +0100
message:
  (Jelmer) Pass create_prefix parameter to BzrDir.push_branch.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2009-07-16 04:56:26 +0000
+++ b/bzrlib/bzrdir.py	2009-07-18 21:09:00 +0000
@@ -1233,7 +1233,7 @@
         return result
 
     def push_branch(self, source, revision_id=None, overwrite=False, 
-        remember=False):
+        remember=False, create_prefix=False):
         """Push the source branch into this BzrDir."""
         br_to = None
         # If we can open a branch, use its direct repository, otherwise see

=== modified file 'bzrlib/push.py'
--- a/bzrlib/push.py	2009-06-08 05:00:01 +0000
+++ b/bzrlib/push.py	2009-07-18 21:09:00 +0000
@@ -125,7 +125,7 @@
                     "already exists at the destination location.")
         try:
             push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
-                remember)
+                remember, create_prefix)
         except errors.DivergedBranches:
             raise errors.BzrCommandError('These branches have diverged.'
                                     '  See "bzr help diverged-branches"'