[MERGE][1.6][bug #259275] Disable automatic stacking via Bzrdir control.conf

[Robert Collins]

On Tue, 2008-08-19 at 16:04 -0500, John Arbash Meinel wrote:
> 
> IMO, the appropriate fix is to have the "default_stack_on" config
> variable
> only respected when the source branch format supports it. And have
> this be
> true for both .sprout() and .clone().

This makes sense to me, because the user hasn't passed an explicit
parameter. But they may well have manually setup a config to achieve
this, so I'm not entirely convinced. I do want 1.6 to come out
though ;).

> If the user explicitly supplies the '--stacked' flag, they can
> somewhat expect
> it will upgrade their branch.

> Also, one could argue that LP shouldn't be telling the user to stack
> unless a
> project has decided it wants that feature. However, it is a really
> nice use
> case if we can get auto-stacking to work well (as 'bzr push lp:'
> becomes
> vastly better)
> So for now, I'm just reverting the ability to detect the automatic
> stacking
> policy in the target. And I'll reject the changes when I merge that
> back into
> bzr.dev.

I think that that is the expedient solution, and 1.7 is close so there
is not a long delay before users get a fix via 1.7.

bb:approve

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080820/458583a0/attachment.pgp