Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\ \|\| '

[Noel L Yap]

>>(The debate with Paul on this one started because he seemed to think you
>>should be able to do "cvs diff | mail vendor" and get the vendor to take
>>back all your changes or something.  I think he was just being contrary.)
>
>That is not at all what I conveyed.  My question was:  What if the files
>that contain the conflict mark-ups are supplied by the vendor, to be
>checked in on the vendor branch?  Do you now expect CVS to be able to
>tell the difference between vendor branches versus any other branches,
>and allow the user to commit files containing arbitrary text on vendor
>branches while refusing commits elsewhere if files contain conflict
>mark-ups?

OK, I didn't think I made up the content of your email in my head -- at least
now I know my memory isn't that short :-)

>Now, given your requirement that CVS refuse to commit certain files
>(namely, files containing conflict mark-ups, though there's no guarantee
>that you or someone else might amend this list of offensive material at
>a later time), what is CVS to do?  It can't do it both ways, unless
>Noel's recommended "cvs commit -f" option is implemented.

I want to note that "cvs ci -f" is not even close to being an ideal solution.
The problem is that there are several conditions where "cvs ci -f" will override
checks (eg identical files, missing edit when using the "cvs ci -c" patch).  You
may actually want "cvs ci" to abort when some of these conditions exist, but not
when conflict markers exist.

It may be better to have yet another option to override any marker checks.  Or
what about an option in CVSROOT/config?  Again, I want to make it clear I am
against checkin aborting due to marker detection, but, if this were introduced,
it should still be left to the user to decide whether they want it or not.

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.