Merge lp:~spiv/bzr/spurious-stacking-warning into lp:~bzr/bzr/trunk-old

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

This seems to fix bug 388908.

It's awkward to write a test directly for the symptom in that bug, because the
server will emit the warning anyway, and the server and client's logs are
mingled together in the test suite.

An alternative "fix" would be to change the default branch format to format 7...

[Robert Collins (lifeless)]

 review +1

I would test via blackbox I think; stderr and stdout are what we're
checking.

-Rob

review: Approve

[Andrew Bennetts (spiv)]

Robert Collins wrote:
> Review: Approve
> review +1
>
> I would test via blackbox I think; stderr and stdout are what we're
> checking.

Well, the test would have to be that “Source branch format does not support
stacking” only appears once rather than twice, because the server code (that
runs in the same process in selftest) will emit it to the fake stderr. That
doesn't seem like a very satisfying test to me, but maybe it will have to
do.

Of course, the server really shouldn't be trying to use stderr, but that's a
separate bug...

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2009-06-19 09:06:56 +0000
+++ bzrlib/bzrdir.py	2009-06-23 05:58:02 +0000
@@ -3270,6 +3270,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.