Re: Updating Locally Modified

[Larry Jones]

Prashant writes:
> 
> Hi, this is my problem.  I have a file that is locally modified (i.e.
> newer than the version in the repository), but what I want to do
> update my working version from the repository version (i.e. merge the
> changes i've made).  CVS won't let me do this because it doesn't merge
> locally modified files.

Huh?  CVS most certainly does merge locally modified files.  What are
the exact commands you're using and what is the exact error you're
getting?

> But whenever a new version of the open source code
> comes out, I just want to download the files, and patch them with my
> modifications.  Whats the easiest way to do this?

Read the section of the manual on tracking 3rd-party sources:

        <https://www.cvshome.org/docs/manual/cvs-1.11.16/cvs_13.html#SEC103>

-Larry Jones

That's the problem with nature.  Something's always stinging you
or oozing mucus on you. -- Calvin