Re: have finished reading http://cvsbook.red-bean.com/cvsbook.html however, ..

[Alex Liberman]

ok, calmed down, re-read:
 http://cvsbook.red-bean.com/cvsbook.html#Examining%20And%20Reverting%20Changes

and good to go :D


On Mon, May 30, 2005 at 07:00:55PM -0700, Alex Liberman wrote:
> My reading comprehension of it must be < 100%, because
> when I tried the following,
> 
> 1. edit hello.c, add some experimental stuff
> 
> 2. do a cvs commit of above, it tells me version is now 1.2 from 1.1
> 
> 3. I revert back to non-experimental version of hello.c like so,
> cvs update -r 1.1 hello.c
> 
> 4. put some normal non-experimental stuff into hello.c
> 
> 5. *attempt* to check in, expecting to get 1.3 of hello.c:
> $ cvs ci -m"sendersname" hello.c
> 
> Instead I get,
> 
> cvs server: sticky tag `1.2' <--may have said 1.1 I'm not sure
>  for file `hello.c' is not a branch
>  cvs [server aborted]: correct above errors first!
> 
> when I try to make it happy by removing sticky tag like so,
> cvs update -A hello.c
> 
> it messes up my working copy of hello.c! Lucky I made a backup of it,
> so I was able to
> cp hello.c.orig hello.c
> and
> cvs ci -m"blah" hello.c
> 
> Which it then accepted.
> 
> Question is, what would have been the "correct" way to handle the
> above situation?
> 
> Thx -Alex
> 
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/info-cvs