[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, 20 Jul 2001 11:04:49 -0400 (EDT)

[ 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.)

                                                        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]