Carsten Ziegeler wrote:

I think the next steps should be:
a) merge things back from 2.2 to the 2.1.x branch

Yup.


   We should backport all bug fixes, especially the fix
   for the sitemap reloading problem.
   What do you think about tracing the status of the
   merge (which block has already, which needs to etc.)
   on the wiki?

That's an option.


b) clean up the directory for the new kernel proposal
   I think the new kernel should only contain the kernel
   but not the whole cocoon stuff; it's outdated anyway.
   Most of the stuff we have added to our cocoon-2.2 CVS
   repo is now in the cocoon/trunk (apart from the Fortress
   migration).

If it's only new kernel, then it's not a branch anymore - but subdirectory in whiteboard. I'd postpone changes in this branch till we complete mering in changes into 2.1.6 and Fortress migration.


Vadim



Reply via email to