Re: How to disable automated merge when do update

[Larry Jones]

xiangbin writes:
> 
> 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 !!!

No, it's not -- CVS keeps it as a backup named .#<filename>.<rev> (e.g.,
revision 1.6 of foo.c would be renamed .#foo.c.1.6).

> 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 ?

Yes, the cvswrappers file:

        <http://ximbiot.com/cvs/manual/cvs-1.11.22/cvs_18.html#SEC166>

-Larry Jones

It must be sad being a species with so little imagination. -- Calvin