Re: updating 3rd party code issue

Larry Jones <[email protected]>
Newsgroups gmane.comp.version-control.cvs.general
Message-ID <[email protected]>
kunal patel writes:
> 
> I am trying to create a cvs repository for managing  modified openssl
> distribution for my company. I am very new to CVS and ran into quite of
> problems while doing it.. Please see the below listed steps that I followed
> for doing it.

You need to read the section of the manual on tracking third-party
sources:

	<http://ximbiot.com/cvs/manual/cvs-1.11.23/cvs_13.html#SEC103>

What you need to do is start over and import the *unmodified* source
code you started with first.  Then check it out and replace the checked-
out code with your modified code and check it in.  Then you can import
the new version and merge the changes into your version successfully.
-- 
Larry Jones

Let's just sit here a moment... and savor the impending terror. -- Calvin
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.