On Tue, 21 Dec 2004, Andrew DeFaria wrote: > How many times do you alter the source code to provide site specific > functionality? And what do you do when the next version of CVS comes out?
You merge! On a previous job, I maintained site-specific extensions to WinCVS, and merged them against new public releases. (In one case, the merge was quite difficult, because the framework for handling columns in the file browsing view was rewritten, so the columns I added had to be retargetted to that framework). Most of the merges were easy though. Of course, I used CVS for the merging. These days, I'd use my Meta-CVS, which has better support for tracking third-party sources. A normal branch can be used as a vendor branch, and the import tool ``mcvs grab'' figures out renames (and looks at symbolic link reconfigurations and execute permission changes too). So merging is possible even if you have locally renamed or moved some files, and the new snapshot does the same. -- Meta-CVS: the working replacement for CVS that has been stable for two years. It versions the directory structure, symbolic links and execute permissions. It figures out renaming on import. Plus it babysits the kids and does light housekeeping! http://freshmeat.net/projects/mcvs _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
