Re: merge question.

[Larry Jones]

Mats Cullberg writes:
> 
> For some of the files I get the following message:
> 
> cvs update: file makefile.dep does not exist, but is present in revision
> RELEASE-2-2.
> 
> I notice that this file does not get created in the trunk, what am I
> doing wrong ?

That means that the file was deleted from the trunk after the branch was
made, but it was modified on the branch.  CVS doesn't know what you want
to do in that case -- it can't apply changes to a deleted file -- so you
have to figure out what you want to do and then do it.

-Larry Jones

Do you think God lets you plea bargain? -- Calvin