[MERGE][1.7] Alert users when --stacked overrides format

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>> Your new code has a different path, which doesn't trigger this. Which is a bit
>> sad, because I *do* think we should tell people when we use a branch format
>> that isn't backwards compatible.
> 
> I think I completely missed that.  I agree that fixing it would be good.
> 
>> So I'm proposing the attached patch for bzr-1.7 which gives:
>> $ bzr branch --stacked ~/dev/bzr/bzr.dev
>> Stacking requires repository format:
>>   Packs 5 (adds stacking support, requires bzr 1.6)
>> Not preserving source format.
> 
> That's nice, but it doesn't actually say that Packs 5 is being used.
> 
> How about:
> Because source format is not stacking-compatible, using format:
> Packs 5 (adds stacking support, requires bzr 1.6)
> 
> bb:tweak
> 
> Aaron

I also thought it would be good to give the equivalent "--1.6" flag, so I went
with this text:
Source format does not support stacking, using format: '1.6'
  Packs 5 (adds stacking support, requires bzr 1.6)

Created new stacked branch referring to ...


Or if the source is 'rich-root':
Source format does not support stacking, using format: '1.6.1-rich-root'
  Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)

Created new stacked branch referring to ...

That way users have a link between what is happening, the fact that it
requires newer bzr, and the option on the command line.

I also added tests that the user is so informed. We had tests that checked we
*could* do 'bzr branch --stacked', but they did not test stderr for
informative messages. (Note that we *do* have blackbox tests for that behavior
with 'bzr push'.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIvbLTJdeBCYSNAAMRAlNjAJ4txKZr3XbHhYL19rRXtPmmVjje8wCggjmY
S6LgukwgHWkHjeJMJJDuJ0c=
=6Xit
-----END PGP SIGNATURE-----