[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: Fri, 20 Jul 2001 14:43:22 -0700

>--- Forwarded mail from address@hidden

>[ On Friday, July 20, 2001 at 07:02:05 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> 
>> |^\|\|\|\|\\|\| '
>> I think you're missing the point.  Let's say you get some code from a vendor
>> that contains CVS conflict markers and you want to put them on a vendor 
>> branch,
>> what do you do?

>Well Noel, I'll repeat my answer, yet again, just for you.

>You do nothing until you have to change the file in question.  Then
>before you commit it you do whatever's necessary syntactically to hide
>the markers.  That's it.  That's all.  I.e. you do the same thing you'd
>have to do with your own code, except you don't do it until/unless you
>have to change a given vendor file.  Pretty simple, eh?

>(The debate with Paul on this one started because he seemed to think you
>should be able to do "cvs diff | mail vendor" and get the vendor to take
>back all your changes or something.  I think he was just being contrary.)

That is not at all what I conveyed.  My question was:  What if the files
that contain the conflict mark-ups are supplied by the vendor, to be
checked in on the vendor branch?  Do you now expect CVS to be able to
tell the difference between vendor branches versus any other branches,
and allow the user to commit files containing arbitrary text on vendor
branches while refusing commits elsewhere if files contain conflict

I agree with you that patches that I send to the vendor probably won't
come back verbatim.  On the other hand, I can also expect the vendor to
supply changes that I didn't submit.  But in the end, I have no control
over what the vendor ships to me, and yet I have a requirement that I be
able to commit everything I get, verbatim.

Now, given your requirement that CVS refuse to commit certain files
(namely, files containing conflict mark-ups, though there's no guarantee
that you or someone else might amend this list of offensive material at
a later time), what is CVS to do?  It can't do it both ways, unless
Noel's recommended "cvs commit -f" option is implemented.

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

reply via email to

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