[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Noel L Yap
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\ \|\| '
Date: Fri, 20 Jul 2001 07:02:05 -0400

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?


[ On Thursday, July 19, 2001 at 15:10:44 (-0400), Noel L Yap wrote: ]
> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\
|\|\| '
> Are you saying that CVS will somehow (in yet an undisclosed manner) detect
> vendor branches and allow the checkin when there are conflict markers?  Or are
> you saying that stuff checked into vendor branches may not really be what the
> vendor gave you to begin with?

No, I said that you'd be an idiot to assume you could do something so
basic as "cvs diff | mail vendor" and expect they'll all come back to
you in the next release just as you e-mailed them.  This is true no
matter what changes you've made locally, or why you've made them.

What changes you send to a vendor, and in what form, is of course up to
you.  However what changes the vendor accepts is up to them.  If the
vendor uses CVS then they're not going to have any conflict markers in
their files in the first place, but if they don't and they do
(respecively), then it's your responsibility to ensure the changes
necessitated by your choice of version control tool are properly
managed (which probably means not trying to send them to the vendor, or
at least not expecting them to be accepted if you do).

                                   Greg A. Woods

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

Info-cvs mailing list

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.

reply via email to

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