Re: rolling back

[Kaz Kylheku]

In article <address@hidden>, r w wrote:
>Hey all,
>time for a newbie question i believe.  I was curious if there was a way to 
>roll back to a previous version utilizing cvs AND deleting the current 
>version of a file.

I should abandon thinking about version control in terms of the primitive
tool you were using previously. The very concept of rolling back is wrong.
You cannot roll anything back in a version control system, because that
is equivalent to turning time back, and discarding information.

Rather, you can create a new version of a file in which some past
changes are reversed. This is done by merging on those changes
in reverse using two -j options. For example, if version 1.5
of a file was a bad one, you can try to remove it from your
working copy using

        cvs update -j 1.5 -j 1.4 <file>

Note the reversed order of the versions; you are merging the changes
between 1.5 and 1.4 which are just the changes between 1.4 and 1.5 done
in reverse.

The merge may introduce conflicts which you have to resolve before
you commit the new version.
was done 



  Everytime I try to roll back and check in a previous 
>versioned file .. the changes are merged.. am i missing a flag of some sort?
>please cc me
>
>Thanks,
>R.
>
>
>
>_________________________________________________________________
>Get your FREE download of MSN Explorer at http://explorer.msn.com/intl.asp
>
>


-- 
Refracturing: the technique of taking broken code, and breaking it some more.