|Subject:||cvs checkout merging with non-cvs source|
|Date:||Wed, 17 Jan 2001 12:17:30 -0800|
I think that subject makes sense, but here goes my question:
My group develops add-ons and custom solutions to a set of pre-developed sourcecode and I'm wondering if there is an easy way to checkout our custom solutions from CVS and merge them with the pre-developed source tree.
We have this source tree already:
The idea is to have a CVS repository with only the new/modified files:
/perl/onlinelib/catalog.pm (modified from original source)
/perl/sharedlib/License/Shared.pm (modified from original source)
when we want to bring a pre-developed source tree to the modified state, we'd move to the root, issue checkout, and CVS would recurse through and add the two new files(newfile.pm and new-shared-file.pm) and update the two modified files(catalog.pm and Shared.pm). All other files it would leave alone. It would also add the necessary CVS directories so that we could do add's and commit's when need be.
I've tried it already, but i get errors, specifically pertaining to entries.log.
Is this easy, hard, really hard, impossible?
Thanks in advance...
|[Prev in Thread]||Current Thread||[Next in Thread]|