[MERGE][1.6.1][bug #262333] New repo format for rich roots with a proper serializer

[John Arbash Meinel]

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

Matt Nordhoff wrote:
> John Arbash Meinel wrote:
>> Aaron uncovered that --1.6-rich-root was actually a bit confused as to whether
>> it was trying to be --1.6-subtree or not. It seems the serializer supported
>> subtrees, but the layering did not. So you couldn't directly stack on a
>> --rich-root-pack repository, and you might accidentally fetch from a
>> --dirstate-with-subtree one.
>>
>> So this patch deprecates the --1.6-rich-root format, in favor of
>> --1.6.1-rich-root.
>>
>> I'm not 100% sure about the naming. I could name it --1.6-rich-root and
>> --1.6-old-rich-root. (or --1.6-rich-root-broken).
>>
>> I'd like to get some form of this into 1.6.1, so it would be nice to get feedback.
>>
>> John
>> =:->
> 
> I'm not a reviewer, but...
> 
> bb:tweak/bb:comment
> 
> I'm +0.9 on calling the new format "--1.6-rich-root" and renaming the
> old format to "--1.6-rich-root-broken" or something similar. This is a
> serious issue, and there's historical precedent: the original pack
> formats were renamed once, right?
> 
> Also, this is weak, but if the old format wasn't renamed, a user could
> accidentally type in "--1.6-rich-root" when creating a branch or
> something. At the very least, I think that's more likely to happen than
> someone being confused by a one-week-old, non-default format changing names.
> 
> Also:

So we went with --1.6.1-rich-root and removed 1.6-rich-root from being
available entirely.

The downside is that people doing "bzr info" on their repo will get "unknown"
rather than it showing 1.6-rich-root. The upside is that they won't
accidentally type "--1.6-rich-root".

The other possibility I'm willing to entertain is "--broken-1.6-rich-root".

However, when you run "bzr info" on a 1.6-rich-root repo, you will get:

Format RepositoryFormatKnitPack5RichRootBroken is deprecated, please use "bzr
upgrade --1.6.1-rich-root".

before the info, so any access will tell you what you should use.

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

iD8DBQFIuBD4JdeBCYSNAAMRAi9bAKDYkdZAKtIz6EL/GHMVAGq7q2X3hACfRylQ
xcVgwf6fDSFl1rbYCbB14s0=
=YwRY
-----END PGP SIGNATURE-----