Removing revisions

[Greg]

Hi all-
I have a question about removing revisions; I might have found the 
answer but wanted to get some other opinions to make sure I'm trying the 
right thing as I'm not a CVS expert...

I have a branch for a customer that we've been developing an engineering 
version of our software for.  Things were going ok until they said they 
don't want some of the latest features that had recently been put in.

That was fine; a few revisions back (e.g. 1.99.2.2 for a particular 
module; current revsion on the server is 1.99.2.5) had pretty much what 
they wanted, so I did some mods to that revision and have the desired 
end product.

The problem is that now I want that locally modified revision to be 
committed, and in fact no longer need/want any of the changes done for 
the current committed revision (1.99.2.5).  So basically I want the 
locally modified 1.99.2.2 to become 1.99.2.6, with none of the additions 
of 1.99.2.3 - 1.99.2.5 merged (or to delete 1.99.2.3-5, and make the 
locally modified 1.99.2.2 the new 1.99.2.3).  I hope that makes sense...

Can someone tell me the best way to go about this?  I have read that the 
admin command may do what I want, but I want to make sure I can't do an 
update of some sort before trying (the multiple revision update doesn't 
quite seem what I want, but maybe I'm not understanding it correctly).

Thanks for any guidance
Greg