[cvsnt] Re: putting my changes into newer version files

[douglass_davis at earthlink.net]

Oliver Giesen wrote:

>douglass_davis at earthlink.net wrote:
>
>  
>
>>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.
>>    
>>
>
>That is the classical use case scenario for the Import command. Look
>here: http://www.cvsnt.org/manual/html/Tracking-sources.html
>
>Hope this helps. 
>
>  
>
Thanks. Yes this helps. 2 things i don't really understand though...

This is from the manual:
cvs import -m "Import of FSF v. 0.05" fsf/wdiff FSF WDIFF_0_05

I'm not really sure what "fsf/wdiff" is (the documentation doesn't 
say).  I'm guessing fsf is a module and wdiff is a directory??  Or is 
the whole thing supposed to be a module name?  If the first one is the 
true, that seems to imply that i can import code into any where in my 
source tree...

-- 
http://www.douglassdavis.com