[Top][All Lists]

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

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

From: Noel L Yap
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\ |\|\| '
Date: Wed, 18 Jul 2001 10:40:26 -0400

>[ On Tuesday, July 17, 2001 at 20:48:27 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\
|\|\| '
>> This doesn't address the issue of simplicity of use.  Your steps to put
>> something into CVS is extremely complicated if conflict markers exist.
>> you don't care about this fact, or you're ignoring it.
>Where?  I see no complexity here.  Anyone who used CVS before Kingdon's
>unilateral change had already bought into the notion that CVS detected
>conflict markers and kindly prevented you from cheking them in.

And Jim Kingdon found that such a tool was a pain to use, too.  So much so that
he changed it.

And according to your post:
     [ On Friday, July 13, 2001 at 16:40:47 (-0400), Noel L Yap wrote: ]
     > Subject: Re: How well does CVS handle other types of data?
     > I think this is only partially true.  Since CVS doesn't currently
     > know whether there are any remaining conflicts, why would it be a
     > when doing manual merges?  For example AFAIK, if I get a conflict upon
     > then touch the file, CVS will gladly check it in for me.  Is this

     If that's true then that's a bug.

     CVS is supposed to look for conflict markers in files and abort a commit
     if it finds any.

     Well, actually it seems you'll only get a warning currently....  Grrr...
     I'll be fixing that _right_now_ in my version!

you didn't even notice this behaviour until my post (although later on you say
you knew about this all along and then blamed Paul for blowing it out of


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]