[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: Tue, 24 Jul 2001 13:15:54 -0400 (EDT)

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

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

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.

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

>  Then
> we'll both have to propagate this difference, re-doing and re-undoing it
> in perpetuity.  This is an unnecessary overhead, and CVS has no business
> imposing it.

Duh.  That's why you use CVS vendor branches in the first place.

In case you hadn't noticed yet, you should learn real soon that CVS
doesn't actually force you to merge your changes with the new vendor
release (though that's certainly one way of doing things).  Normally CVS
forces you to merge the vendor's new changes into your local version.
I.e. once you've made a change to a vendor branched file you will
forever have to merge vendor changes into that file.  In other words
what actually normally happens is entirely opposite to what you've

Perhaps this is why you're failing to understand the mechanisms involved
here and why the case of vendor branched files with conflict mark-up is
entirely different from the normal case for non-vendor-branched files.

                                                        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]