Re: cvs merge

[Lan Barnes]

Mike Castle wrote:
> 
-snip-
> If you need to commit and others have changed the file too, and you are
> certain, VERY VERY CERTAIN that you don't want those changes, then rename
> your file, cvs update, copy your renamed file over the file just checked
> out, then commit.  THIS WILL LOSE CHANGES!

Clarification requested: Would it be more accurate to say that
the changes would no longer be reflected in the tip of the trunk,
but would still be available in the previous revision? Serious
question -- I want to be sure I understand this.

TIA

-- 
Lan Barnes                 address@hidden
Icon Consulting, Inc       858-273-6677

The statesman's task is to hear God's footsteps marching 
through history, and to try to catch on to His coattails
as He goes marching past.
                            - Otto von Bismarck