[cvsnt] tracking 3rd party sources/branching/merging issues

douglass_davis at earthlink.net douglass_davis at earthlink.net
Sun Apr 9 21:56:38 BST 2006


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


I am using wincvs

I'm trying to understand the import process.  I saw this in the manual:

"For files that have not been modified locally, the newly created 
revision becomes the head revision."

Say this is my 2nd time importing and i've never changed this particular 
file.   revision 1.1.1.2  now becomes the head revision.

Which is ok, but now if i make any changes to the code, it gets changed 
in the vendor branch not the main trunk. I thought only changes that the 
3rd party makes are supposed to be in the vendor branch, and my changes 
are supposed to be in the main trunk.

This seems like a problem to me, if i import code next time, it will put 
those changes in 1.1.1.4 or whatever, possibly obscuring my changes in 
1.1.1.3. 

Is thee a way i can change the head revision back to 1.1 (main trunk) so 
i will be changing code there? Considering the main trunk isn't 1.1 with 
all files.  Is there some kind of special keyword to check out the main 
trunk?

Or is this not necessary?

Thank you.

-- 
http://www.douglassdavis.com




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook