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

[Noel L Yap]

>[ 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!

Whether the vendor takes these changes is irrelevent.  What matters is what
you're keeping track of in your repository.  CVS has never forced anyone to have
one checkin represent two change sets.  There's no reason for it to start now.

Noel



This communication is for informational purposes only.  It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan Chase & Co., its
subsidiaries and affiliates.