[Top][All Lists]

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

Re: Coflict marker detection proposal

From: Greg A. Woods
Subject: Re: Coflict marker detection proposal
Date: Wed, 18 Jul 2001 13:33:48 -0400 (EDT)

[ On Wednesday, July 18, 2001 at 10:27:46 (-0400), Noel L Yap wrote: ]
> Subject: Re: Coflict marker detection proposal
> I think it may be possible for CVS to keep track of which markers it puts in.
> For example, it can keep the line numbers of these markers somewhere in the 
> subdirectory.

It may, but it didn't and it doesn't and it's a *LOT* of work to make it
do so.  You're welcome to submit patches to the community for review
though!  ;-)

> And such code may not be able to be checked in each time the conflict marker
> check changes.

If you ever plan to change the conflict markers then you're in far
deeper doo-doo than you think....  (I.e. the conflict marker check will
not ever change unless diff3 changes.  You're grasping at straws!)

> You're dodging the entire issue that CVS should not ever prevent (although I 
> can
> see where it would want to avoid) checkins of files that are deemed to be
> correct.

No, I'm not.  CVS is a concurrent versioning system.  It works (best)
with files that are easily mergable using diff3.  Use anything else,
including files that appear to have unresolved diff3 merge conflicts,
and you loose.  Too bad, so sad, go get a real non-concurrent versioning
system for your silly files.

> If this issue is so non-important that everyone is wasting time discussing it,
> why do you keep pushing your proposal on everyone?  Why not just drop the 
> topic
> and keep the distribution as is?

Because you asked me to discuss it on more time......

                                                        Greg A. Woods

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

reply via email to

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