[Top][All Lists]

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

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

From: Greg A. Woods
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\\|\| '
Date: Fri, 27 Jul 2001 14:30:53 -0400 (EDT)

[ 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!

                                                        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]