...So what about the following (somewhat already expressed, BTW) :
- start a 2.2 repo with only the Cocoon core (i.e. src/java)
- copy blocks in the 2.2 repo only if they require substantial changes that would break the ability to quickly do a 2.1.x release.
- have an intelligent 2.2 build that gets missing blocks from the 2.1 (IIRC Carsten talked about it)
- backport to the 2.1 non disruptive enhancements/bug fixes appearing in the 2.2 repo
Sounds perfect from here!
I'd just add a first (obvious) step: -Tag the 2.1 repository before the move
..The only problem is if "real blocks" require to modify the directory structure of blocks. I'm not sure of this, as I mostly envision it as an augmentation of the current structure, e.g. with a new "web" directory that would contain the block's sitemap and resources...
I think the above structure allows us to take care of this in due time, should the need arise.
-Bertrand