Re: How to disable automated merge when do update

[Mark E. Hamilton]

xiangbin wrote:
> Hi,all
> The cvs like to do automated merge when do update .But when conflicts 
> happened, local file will be changed and contained both sets of changes, 
> that means the original local file is lost !!!
> I would really prefer cvs do not do automated merge when do update.I 
> wonder if there is a way to disable this kind of behavier ?

No, it is not possible to disable this behavior.

I think that you are misunderstanding the purpose of the 'cvs update' 
command. Its *purpose* is to merge into your working copy any changes 
made to the file since you checked it out. If you don't want this done 
in your working directory, don't use 'cvs update'.

However, before you can commit change you have to do 'cvs update', so 
your changes are merged with any other changes. This automatic merge is 
what allows 'Concurrent' development (the meaning of the 'C' in 'CVS') 
to occur. If conflicts occur you need to correct them before you commit 
your changes.

Note that the when conflicts occur the original file is saved in 
.#file.x.y (where x.y is the original revision number you checked out.) 
Do not, and I repeat *DO NOT*, simply copy this file back onto the 
updated file. Doing so will delete any changes that other users may have 
made to the file.

--
----------------
Mark E. Hamilton
Orion International Technologies, Inc.
Sandia National Laboratory, NM.
505-844-7666