Re: tracking third party sources...

[Larry Jones]

Venu Vadapalli writes:
> 
> 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. 

That doesn't make any sense at all.  Either you're doing something very
wrong (like having your -j options in the wrong order or not importing
the whole directory tree) or you're misreading the messages.  Like I
said, it would be helpful to see what "cvs log" or at least "cvs status
-v" has to say about one of the affected files.

> 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? 

Not quite.  It checks out the head of the trunk.  Exactly which branch
that is depends on the setting in each RCS file.  Then it merges in the
changes between release A and release B.  Files that exist in release B
but not in release A are created and scheduled for addition, files that
exist in release A but not in release B are deleted and scheduled for
removal.

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

It doesn't matter where you run the above command because it creates a
new directory.  You should not use a variant that does not create a new
dirctory, though.

-Larry Jones

I wonder if you can refuse to inherit the world. -- Calvin