Re: Reverting a concrete revision

[Larry Jones]

address@hidden writes [in very long lines]:
> 

>       Using i.e "cvs update -j <revision 1.6> -j <revision 1.3>
> file.c", we discard changes from 1.6 to 1.3. Then, commiting, we get
> revision 1.7 that is exactly the same as 1.3. Now, suppose I want to
> generate a new revision of "file.c" but containing code from 1.1 to 1.3
> + 1.5 and 1.6 revision, because I realise that I don not want the
> changes made on revision 1.4 but still want all the changes made in 1.5
> and 1.6. Doing the previous update, I lost 1.4 changes but also 1.5 and
> 1.6. So the idea is revert ONLY the changes that were made on 1.4. If
> the changes of 1.5 and 1.6 are small (or changes of 1.) it can be do it
> manually but this is not my case.
> 
>       Is there any way to do this in CVS?

Of course, just merge those changes back in:

        cvs up -j1.4 -j1.6 file.c

-Larry Jones

These findings suggest a logical course of action. -- Calvin