Rev 4541: (andrew) Fix spurious 'does not support stacking' warning when in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4541 [merge]
revision-id: pqm at pqm.ubuntu.com-20090716074221-a8ydf0c5tg54k35c
parent: pqm at pqm.ubuntu.com-20090716062420-z6350op7yg4j8giy
parent: andrew.bennetts at canonical.com-20090716053017-n6x62h5aijiqjyct
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-07-16 08:42:21 +0100
message:
  (andrew) Fix spurious 'does not support stacking' warning when
  	pushing.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== modified file 'NEWS'
--- a/NEWS	2009-07-15 23:13:57 +0000
+++ b/NEWS	2009-07-16 05:30:17 +0000
@@ -30,6 +30,9 @@
   commit that found a missing file will leave the tree unedited.
   (Robert Collins, #282402)
 
+* Fixed spurious "Source branch does not support stacking" warning when
+  pushing. (Andrew Bennetts, #388908)
+  
 * ``WorkingTree4.unversion`` will no longer fail to unversion ids which
   were present in a parent tree but renamed in the working tree.
   (Robert Collins, #187207)

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2009-07-01 10:49:05 +0000
+++ b/bzrlib/bzrdir.py	2009-07-16 04:56:26 +0000
@@ -3269,6 +3269,7 @@
         else:
             remote_repo = None
             policy = None
+        bzrdir._format.set_branch_format(self.get_branch_format())
         if require_stacking:
             # The repo has already been created, but we need to make sure that
             # we'll make a stackable branch.