[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: Tue, 24 Jul 2001 14:27:07 -0400

>[ On Friday, July 20, 2001 at 15:38:47 (-0700), Paul Sander wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>>
|^\|\|\|\|\|\|\| '
>> In this case, I must commit the file (CVS did not introduce the conflict
>> mark-up in this case, and I really don't want to change it).  I should
>> definitely be able to do a "cvs diff | mail" to get my change to the vendor.
>> And that change will not include the conflict mark-up because that part of
>> the file has not changed.
>You're thinking upside down (or backwards, or inside-out, or choose your
>own simile).
>First, since CVS will obviously be unable to discern the vendor's
>conflict mark-up from its own, you must eliminate the confusion by
>hiding or otherwise resolving the vendor's conflict.

If you go by popular demand, you're the one thinking backwards here, Greg.
Since there's no way for CVS to discern  the vendor's
>conflict mark-up from its own, it shouldn't force any conventions on the user.

>Then, secondly, you'd commit your local change.

And munge two change sets into one.

>Obviously a diff from the vendor branch to the local branch will show
>both changes, but that's for you and the vendor to sort out, not CVS.

I always thought you supported one change per checkin.

>> Also, if I am required by CVS to hide or otherwise escape the mark-up, then
>> the vendor will see it as a gratuitous change and refuse to accept it.
>Duh.  Who cares?  CVS certainly doesn't!

NCVS won't.


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]