-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Lemke, Michael IZ/HZA-IOR <[EMAIL PROTECTED]> writes:
> Thanks for the quick reply. I did not cvs rm the file, this is the
> result of a merge, which went wrong.
Yes, a cvs merge can do the 'cvs rm' equivalent for you.
> > You will need/want to do a 'cvs add PATCH002.htm' to reverse this
> > operation before you will see the file back again in this directory.
>
>
> > >
> > > Now I want back the version at tag QP_LAST_WORKING_VERSION, so I do
> > >
> > > $ cvs up -r QP_LAST_WORKING_VERSION PATCH002.htm
> > > R PATCH002.htm
> > >
> > > Why isn't it adding the file right back?
> >
> > 'cvs add PATCH002.htm'
> >
>
> Well, that will be tricky for the whole tree. In fact, I don't want
> to add it,
The 'cvs add' will only modify your checked out tree in this case.
> it is already there, in rev QP_xxx. I just want cvs to
> restore my sandbox as it was before I messed it up. Isn't there a
> better way?
Better? That is very subjective.
You could reverse the arguments of the merge operation as an
alternative...
-- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQFBt1593x41pRYZE/gRAtL8AJ9uPW8hKTBikIJpG2jUFijtLk8k0wCePnMN
cqYcgPnKvz92Qf45ANZ7tN0=
=4Ao0
-----END PGP SIGNATURE-----
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs
