[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Conflict marker detection debate

From: Noel L Yap
Subject: Re: Conflict marker detection debate
Date: Tue, 17 Jul 2001 09:51:36 -0400

>[ On Monday, July 16, 2001 at 18:25:00 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Conflict marker detection debate
>> The problem is that it can't know with certainty whether it or the user
>> manually through an editor or through some other tool) introduced the
>Noel if you'd try to think about the whole problem instead of little
>itty bitty tiny bits then you wouldn't have this problem.

The world consists of more than CVS, therefore, CVS can never know if it should
or shouldn't allow a checkin based on contents -- only the user can know this.
What can be done is to add a "cvs merged" command (as you have mentioned but
probably for a different purpose) that'll tell CVS not to perform a conflict
detection.  This way, syntactic kludges wouldn't be necessary for any file (but
the user is still free to add them in if they so wish)..

>Well, obviouly you weren't on devel-cvs back when the current errant
>behaviour was introduced....  Another quick scan of my archive suggests
>Larry Jones might have been the only person who supported Kingdon.  I
>didn't participate in the discussion then because it would have been
>pointless to do so.  Suffice it to say there was disagreement and the
>change was never reverted until consensus could be reached.

>From the looks of it, you're the only person fighting to revert back the old

In any case, that's all irrelevant since if the old behaviour were reverted
_and_ either a "cvs merged" were added or (I just thought of this one), "cvs ci
-f" forces the checkin, then I'd vote for the reversion.


                                   Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]