[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: Wed, 18 Jul 2001 00:25:22 -0700

>--- Forwarded mail from address@hidden (Greg Woods):

>[ On Tuesday, July 17, 2001 at 19:46:04 (+0200), Pascal Bourguignon wrote: ]
>> Subject: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '
>> There are 328 matching files not  related to CVS.

>Perhaps I should have been more explicit in my instructions.  A list of
>files like that is pretty much useless since a third party has no way to
>tell which might potentially be source files, and which have some format
>or syntax restrictions require the strings to be inserted in exactly a
>way that could be mistaken as conflict markers.....

>So, which of those are "source files" that could not easily be fixed to
>avoid having detectable conflict markers?

All of them, if they're checked in on vendor branches.  It's a big win
if all files suppled from outside can be checked in verbatim, so that
patches can be generated and shipped back to the original vendor.

If the vendor's source files happen to contain strings that look like
CVS conflict markers, then by Greg's logic, either such files must be
skipped, or they must be modified before being imported.  Both options
are unacceptable.

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

reply via email to

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