Re: Branch tag broke my CVS - how can I repair it?

[Larry Jones]

Jim.Hyslop writes:
> 
> 6. Smack your colleague upside the head for misusing the cvs admin command.

Just to expand on this a bit:  The correct way to undo changes is use a
merge to reverse the unwanted changes and then commit a new revision. 
What your colleague should have done was:

        cvs up -j1.3 -j1.2 access_log.c
        cvs ci -m'back out 1.3 changes'

You should *never* outdate a revision unless you know for sure that no
one has it checked out or has tagged it and you're prepared to deal with
these kinds of headaches when you find out that you're mistaken.  :-)

-Larry Jones

It's either spectacular, unbelievable success, or crushing, hopeless
defeat!  There is no middle ground! -- Calvin