[Top][All Lists]

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

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

From: Paul Sander
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\\|\| '
Date: Sat, 28 Jul 2001 23:13:07 -0700

>--- Forwarded mail from address@hidden

>[ On Wednesday, July 25, 2001 at 23:44:29 (-0700), Paul Sander wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> 
>> |^\|\|\|\|\\|\| '
>> I expect to be able to import the vendor's update, whatever it is, without
>> first having to make unrecorded changes to the code just to apease CVS.
>> Inserting escape characters, or otherwise quoting or hiding conflict markers
>> is such a change; THIS behavior must not be required before I commit the
>> vendor's code.

>That's totally idiotic.  You chose to use CVS -- you must work within
>its confines.  If you don't want these problems then don't use CVS!

CVS was broken, but Kingdon fixed it.  Let's leave it that way.

And you need not reply again until you get a more professional attitude.

>--- End of forwarded message from address@hidden

reply via email to

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