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

[Greg A. Woods]

[ On Friday, July 20, 2001 at 11:40:08 (-0400), Noel L Yap wrote: ]
> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> 
> |^\|\|\|\|\\|\| '
>
> >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?
> 
> If you do this, you're not really tracking the differences between what the
> vendor gave you and what you've done to the file(s).  Instead, you're munging
> two separate change sets into one checkin.

Duh.  Do you expect the vendor to take all your changes no matter what?

Unless you make only the most basic changes (or you actually make them
under the explicit instructions of the vendor), then you're *always*
going to have local changes that are not taken up by the vendor!

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>