Re: How well does CVS handle other types of data?

[Noel L Yap]

>If you want to turn automated merging off (either globally or on a
>per-file basis) in CVS then you must first define a mechanism for
>telling CVS when a manual merge has been completed (without any
>remaining conflicts, of course).  This is easy for the case of
>concurrent edits, and harder for the case of branch merges.  See another
>of my recent replies for more details.

I think this is only partially true.  Since CVS doesn't currently absolutely
know whether there are any remaining conflicts, why would it be a requirement
when doing manual merges?  For example AFAIK, if I get a conflict upon update,
then touch the file, CVS will gladly check it in for me.  Is this correct?

Noel



This communication is for informational purposes only.  It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan Chase & Co., its
subsidiaries and affiliates.