On Mon, Feb 21, 2005 at 04:45:56PM -0500, Bob Fyfe wrote: > We receive source code from a vendor which consists of many files > (call it version 1). That source code requires running a 'make' to > set up the environment from the tar file they distribute. > Subsequently, several files have been changed. Additionally, several > files have been created. So at this point you have "vendor" source > files and several "localized" files (i.e. vendor files modified and > new locally created files). This would be an easy scenario to put > things into CVS - you could just put all of it, vendor and locally > modified files there. The problem I am trying to conceptualize > before it happens is when the vendor provides a new release with new > vendor source files and new versions of the locally modified set of > files. I know you can do a merge but I still envision that just in > the vendor code - forget about any local modifications or additions - > there could be many changes to existing files that were never touched > locally or even additions of files. I don't think that we would > necessarily want to track or reconcile these changes. I would think > that we would be most interested in tracking changes between a file > that is given to us and the modifications we've made to it. That is > the type of file I would expect you would want to merge.
What about the following: get sources cvs import mymodule VENDOR version-1 cvs co mymodule cd mymodule modify files cvs ci get new vendor version cvs import mymodule VENDOR version-2 cvs co mymodule cd mymodule cvs update -jversion-1 -jversion-2 file1 file2 file3 With kind regards, Baurzhan. _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
