Forum OpenACS Development: Re: How should OpenACS cvs branches be handled?

Collapse
Posted by Jeff Davis on
In general the right way is to merge the change from the HEAD via cvs update -j 1.19 -j 1.20 utilities-procs.tcl although given it's a one line change I would just do it by hand. I was the one who made the wrong-headed change so I will do it, although in my defense I made the change since I was trying to get more pages to validate and given the sad state of html quoting in the toolkit this was creating lots of pages that did not validate. I did not mean to commit it.

Our intent was to have bug fixes and such go in on 4.6 and be merged forward to the HEAD although some things got fixed on the head. I tried to make sure anything on the HEAD got merged to 4.6 but obviously missed this one.