> -----Original Message----- > From: Mark D. Baushke > Sent: Wednesday, December 08, 2004 8:51 PM > To: Lemke, Michael IZ/HZA-IOR > Cc: [EMAIL PROTECTED] > Subject: Re: Utter confusion > > Lemke, Michael IZ/HZA-IOR writes: > > > I am utterly confused about CVS' workings. I thought I > understood how > > it works but seems like I don't. Look at this: > > > > $ cvs stat -v PATCH002.htm > > =================================================================== > > File: no file PATCH002.htm Status: Locally Removed > > The 'Locally Removed' means you have don a 'cvs rm PATCH002.htm' > in your current checked out tree. >
Thanks for the quick reply. I did not cvs rm the file, this is the result of a merge, which went wrong. > 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, 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? Thanks, Michael _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
