Changes for 1.15.1?

[Andrew Bennetts]

Jonathan Lange wrote:
[...]
> 
> Woot! Thanks Andrew.
> 
> At the UDS sprint, there was also talk of providing bbc stacking
> support in a theoretical 1.15.1. Is this still on the cards?

Sadly, I don't think so.

The revisions to cherrypick for that would be 4392 and 4396.  They're pretty
huge.  Here's the diffstats:

4392: 20 files changed, 962 insertions(+), 190 deletions(-)
4396: 6 files changed, 131 insertions(+), 10 deletions(-)

Now, some of 4392 is sort-of orthogonal locking fixes that are mainly for
the benefit of tests, but it would be hard to untangle, and still pretty
large.

Also, those fixes alone still aren't enough to allow creation of stacked
dev6 branches via a smart server IIRC, due to bugs in the “require_stacking”
logic in bzrdir.py, so the benefit would actually be pretty minimal until
even more fixes are made...

John, care to summarise where dev6 stacking is at?

-Andrew.