CMS solution + web sites in CVS.

I am currently restructuring the web site/web application development life cycle of my company. The new model requires the use of CVS (2 branches) for each web site project. The issue I am facing is the maintenance/development of web sites utilizing CVS, while still providing content management functionality for the customers. I am currently utilizing the Macromedia Contribute software for client web site content management. The system however makes direct modifications to the live web site html/php pages, which makes it difficult to use while still trying to maintain the web site files in CVS. I have considering the implementation of the server wide CMS written in PHP, that would separate the content into a database, and also provide the ability to include content management functionality in custom developed web sites. I am currently evaluating the eZ publish 3.4 (http://ez.no/ez_publish). I would appreciate feedback and recommendations of any other PHP user that has experience with the presented issue. Thanks in advance, -- Lukasz Karapuda VP Application Development - newline Creations LLC http://www.thenewline.com/portfolio.htm lkarapuda@thenewline.com