Re: Reverting a concrete revision

[rolo2002]

That generates conflicts between the result of the update and the working 
revision. Just eliminate the changes made on 1.3 in every version up to this 
one (1.4 and 1.5 in my case) and generate 1.6. 1.6 will contain 1.1, 1.2, 1.4 
(with no 1.3 changes) and 1.5 (with no 1.3 changes), but 1.4 and 1.5 STILL will 
contain 1.3 changes. (To allow history)

Imagine your code contains a menu and each revision means 1 entrie to the menu. 
When you are in 1.5 revision, you realise that entry 3 (revision 1.3) of the 
menu NEVER will be used again, so decide you to eliminate from the code the 
changes required for that revision. Imagine that doing it manually requires a 
lot of time and it's a huge dangerous. Can we tell CVS to do this telling him 
the revision we want to remove?

> address@hidden writes [in very long lines]:
> >
> > A file with 1.1, 1.2, 1.3, 1.4 and 1.5 revisions.
> >
> > Generate 1.6 tah contains code from 1.1, 1.2, 1.4 and 1.5, I mean to
> > NOT include changes made in 1.3 revision
> >
> > Checking out last revision (1.5) and doing "cvs update -j 1.3 -j 1.5"
> > that does nothing...
>
> Of course not -- you've asked CVS to merge the changes from 1.3 to 1.5,
> but the current version is 1.5 so it already contains all those changes!
> If you want to delete the changes made in 1.3, you need to back out the
> changes from 1.2 to 1.3:
> 
>       cvs up -j1.3 -j1.2
>
> -Larry Jones
>
> It's clear I'll never have a career in sports until I learn
> to suppress my survival instinct. -- Calvin
>