David Crossley wrote: > > Vadim Gritsenko wrote: > > Giacomo Pati wrote: > >> Vadim Gritsenko wrote: > >>> Giacomo Pati wrote: > >>>> Well, I'll clean up the HEAD branch slowly but I don't have > >>>> the time to do it in the 2.0 branch as well. I'd suggest to move > >>>> the head to release quality and only patch the 2.0 branch > >>>> for bugs. This way we can get rid of the 2.0 branch sooner > >>>> than later (which was always the proposed way to go IIRC). > >>> > >>> There is one problem with going with HEAD only: HEAD contains some > >>> experimental/unverified/new code, and people always will come with > >>> something new (so this situation won't change with time), and in > >>> contrast with that, branch gets only stable/voted code. > >> > >> Sorry, but there is a scratchpad area where such code can live. It has > >> to be moved there if that code is not stable enough. > > > > Cool. Then we need to cleanup HEAD a little bit and rollout 2.0.1 > > release out of it. > > Vadim > > Whoa, hold on. I thought that the whole of HEAD was an > experimentation area. I remember the Cocoon documentation > saying that, though i cannot find it now. > Hm, I hope that not the whole HEAD is experimental. It *should* be very similar to the 2.0 branch, except for some experimental components.
We created the 2.0 branch some month ago exactly for this experimental stuff which is now much better located in the scratchpad directory. So we really should move all experimental code of 2.1 into scratchpad, sync 2.1 with 2.0 and then only use the HEAD. If we than make a 2.0.1 very fast we can forget about the 2.0 branch. Carsten > There is more required that just a scratchpad dir for new > Java code ... new samples, new and updated xdocs, config > experimentation (e.g. validation during build docs). > > Perhaps the purpose of each branch should be clearly > defined and documented in contrib.xml > --David > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
