Re: pyblosxom web-site update

On 10-Apr-05, at AM 01:42, will guaraldi wrote:
> I haven't looked into it yet, but I suspect all the plugin changes 
> were made in non PYBLOSXOM_1_2 branches, so I'm going to have to get 
> the changes over to the PYBLOSXOM_1_2 branch.  What's our policy on 
> that? Should we be making these sorts of changes in the PYBLOSXOM_1_2 
> and PYBLOSXOM_1_1 branches and then merging them into HEAD?

I plan to use HEAD for final releases, even if it means 1.2, or we have 
updated 1.2 to 1.2.1 (If we have 1.3, then HEAD will not be 1.2 
anymore). DEVEL will contain bleeding edge stuff. People new to 
pyblosxom will always check out HEAD by default, so that must be as 
stable a release as posible IMO.

Because CVS is all we got, we can't really do complicated merges 
without conflicts. If you were to fix PYBLOSXOM_1_1, then if you were 
to release 1.1.1 for a fix, we'd have a tag for that, which is, 
pyblosxom_1_1_1, to check out the differences between 1.1 and 1.1.1, 
one can then do:

cvs diff -u -r pyblosxom_1_1 -r pyblosxom_1_1_1

PYBLOSXOM_1_1 branch will be the 'HEAD' for pyblosxom 1.1.x, unless you 
want to for that off and do some major work, that is.

For now HEAD is somewhere between 1.2 and DEVEL, unfortunately. No one 
had agree to me if we bring HEAD back to pyblosxom 1.2.



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click