[cvsnt] discard garbage revisions and create new 'latest' based onold tag.

Glen Starrett grstarrett at cox.net
Wed Apr 27 17:20:56 BST 2005


Merrill Cornish wrote:
>>>> update with merge command
> 
> "Merge" makes it _sound_ like the good code in the tagged revisions
> will be merged with the garbage code, thereby preserving the garbage
> except for the lines where the tagged revisions and the garbage
> happen to conflict.

Merging on the same branch won't cause conflicts since there isn't 2 
separate points at which the file has changed, it just "rolls back" the 
file to the point defined by the 2nd -j option.

Also, if you don't currently have the files tagged then you can do an 
update -D"date" to get back to the "known good" spot based on date then 
tag it and you're good to use the update -j HEAD -j KNOWN_GOOD method.

-- 
Glen Starrett



More information about the cvsnt mailing list