[MERGE] Add stable format names for stacked branches

[John Arbash Meinel]

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

Martin Pool wrote:
| This adds new formats --format stacked and stacked-subtree for the branch
| format that supports stacking, and also a new internal format marker.
|

I thought we would want "stacked" and "stacked-rich-root" over
"stacked-subtree". As I thought subtree was more 'dev' style and
'rich-root' was where we were trying to get there.

| The description printed by info on such branches is becoming way too long;
| I'll work on making it describe and letting the user set each format
| individually.
|
| I've used the class name in the on-disk format strings as that seems to
| me to tie it up in the most logical way.
|
|

So, other than the fact that we probably want stacked-rich-root over
stacked-subtree

BB:tweak

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkiEq2wACgkQJdeBCYSNAAOQJwCgok4f1YH+mKhNn3sGzLX05Yd1
Ka0AoLa4OGNekNYBr4uLdlkymejGb8DQ
=aT3Z
-----END PGP SIGNATURE-----