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

[Paul Sander]

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

>[ On Wednesday, July 18, 2001 at 00:25:22 (-0700), Paul Sander wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> 
>> |^\|\|\|\|\|\|\| '
>>
>> All of them, if they're checked in on vendor branches.

>Vendor branch support is an entirely different critter and does not
>belong in this discussion.

Oh, so now it's okay to commit any file under some circumstances, but not
others.  So, tell me:  How would CVS differentiate a vendor branch from
any other branch?

>(however iff changes are made to such a file in a vendor-branched module
>then it's trivial to also get rid of or hide the real-looking merge
>conflict markers, just as one would do if they were first-rate source
>files in a non-vendor-branched module)

Perhaps, but getting the vendor to accept the change and put it into their
own distribution for their next drop is another story.

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