Re: remove/add question

[Arcin Bozkurt - Archie]

Larry Jones wrote:

> Arcin Bozkurt - Archie writes:
>
> > Suppose with cvs add or remove I have told CVS server that i will add or 
> > remove a file. CVS makes some preperations. But then, I realize i make a 
> > mistake and don't want to continue anymore. I want to tell CVS to 
> > "forget" about the scheduling it has done for those that are going to be 
> > performed in the first commit...
>
> Add and remove undo each other as long as they haven't been committed. 
> So, to undo an add just "cvs rm" the file and to undo a remove, just
> "cvs add" the file.
Perfect! Works exactly as described.

Continuing on my last email:

<---
The end of the Entries file reads:

[...]
/TextureSetup.cpp/-1.1/dummy timestamp//TTarget_Application-branch
/asdf/0/dummy timestamp//TTarget_Application-branch
D
--->
> cvs remove asdf
cvs server: removed `asdf'

(successfully removed asdf before commit)

> cvs add TextureSetup.cpp
U TextureSetup.cpp
cvs server: TextureSetup.cpp, version 1.1, resurrected

(successfully added the file again)

-----

Thinking I had to create the removed file again in the directory, before 
trying the simple cvs add, i created the TextureSetup.cpp file again in 
my directory. This was NOT what CVS wants. CVS responded:

cvs server: TextureSetup.cpp should be removed and is still there (or is 
back again)

SO: Directly applying  what Larry said, was what I had to do, which I 
learned after an unsuccessful trial. :)

Thanks.