[cvsnt] putting my changes into newer version files

[douglass_davis at earthlink.net]

I am using WinCVS.  forgive me if this is a dumb question...

But, let's say I am working on the source code that some one else has 
released...  Just modifying it to add some new features.  say I have 
downloaded 1.2.1  Then they release version 1.2.2

Now, I would like to be able to fold my changes into the code for 
version 1.2.2, and I suspect that really not much has changed between 
the two versions.  But, I am not sure.  What is the best way to handle 
this situation?  What I would like to end up with, is version 1.2.2, but 
with my code added.

-- 
http://www.douglassdavis.com