[merge] [#252428] allow upgrade of stacked branches

[Robert Collins]

On Mon, 2008-08-04 at 18:04 +1000, Martin Pool wrote:
> Updated, with scenarios.
> 
> The commented-out scenarios fail for reasons I think are spurious and
> unrelated to this test.

bb:resubmit 

I think the new tests belong in bzrlib/tests/per_repository_reference -
parameterised by the source format and whether to do a model change is
fine and nice - the parameterisation will layer naturally and give all
formats that claim to support external references the chance to be
upgraded *to*. (So the interface test for 1.6-subtree and 1.6-rich-root
will be the ones that test a model change).

I'm not clear about the change to catch IncompatibleRepository - can you
enlarge on what will happen to:
"bzr upgrade" 
when I have a stacked branch that needs upgrading to e.g. a newer
stackable format, and a a local repository that needs to be upgraded
past a model change because the external reference has been upgraded...

Actually, I wrote the above, but now I realise that really what confused
me was your comment.

I think its not about whether you can open it or not: its about whether
its a checkout or not. So perhaps:
# XXX: If we couldn't open the branch due to it being an incompatible 
# repository, it is not possible to tell from here whether it is a 
# lightweight checkout or not.

-Rob

-- 
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/20080804/26d66685/attachment.pgp