info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Utter confusion


From: Lemke, Michael IZ/HZA-IOR
Subject: RE: Utter confusion
Date: Wed, 8 Dec 2004 21:32:26 +0100

> -----Original Message-----
> From: Mark D. Baushke [mailto:address@hidden 
> Sent: Wednesday, December 08, 2004 9:05 PM
> To: Lemke, Michael IZ/HZA-IOR
> Cc: address@hidden
> Subject: Re: Utter confusion 
> 
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Lemke, Michael  IZ/HZA-IOR <address@hidden> writes:
> 
> > > > 
> > > > 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.

Ok, but I first have to find all those files which aren't in my sandbox
anymore.

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

Ok, easier.

> 
> You could reverse the arguments of the merge operation as an
> alternative...

Well, that's an idea, why didn't I think of it...  But still no
luck:

$ cvs up -j DEVP_4 -j QP_LAST_WORKING_VERSION PATCH002.htm
R PATCH002.htm
cvs update: file PATCH002.htm exists, but has been added in revision
QP_LAST_WORKING_VERSION

and it's still not there.  


Michael




reply via email to

[Prev in Thread] Current Thread [Next in Thread]