Re: tracking third party sources...

[Venu Vadapalli]

It happens to a lot of files in vendor release B and not for the locally added
files. I know that they were not removed in release B. 

cvs co -jA -jB cvsdir
My understanding is that this command checks out the files (the head of 1.x or 
1.1.1.1) and merges them with vendor release B in my local working area. Hence,
after the co, my local area would have (1.x/1.1.1.1  X 1.1.1.2), right? 

Also, if the above is right, it shouldn't matter in which directory I'm doing 
the
above command.




================================================
Venu Vadapalli writes:
> 
> I imported sources from a vendor with a tag A
[add some files, then imported a new vendor release "B"]
> mkdir /tmp/mergedir
> cd /tmp/mergedir
> cvs co -jA -jB cvsdir
> ===> I see that cvs checks out the files with 'R' prefix which according to 
> the
>      info pages is 'file removed from private copy and will be removed from 
> the
>      repository when commited.

That should only happen for files that were present in vendor release A
that are not present in vendor release B.  If you're getting that for
your added files, you must have accidentally added them to the vendor
branch rather than adding them on the trunk.  It would be informative to
see the results of "cvs log" or at least "cvs status -v" on one of the
affected files.

-Larry Jones