[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:07:23 -0400 (EDT)

[ On Friday, July 20, 2001 at 14:43:22 (-0700), Paul Sander wrote: ]
> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> 
> |^\|\|\|\|\\|\| '
> That is not at all what I conveyed.  My question was:  What if the files
> that contain the conflict mark-ups are supplied by the vendor, to be
> checked in on the vendor branch?  Do you now expect CVS to be able to
> tell the difference between vendor branches versus any other branches,
> and allow the user to commit files containing arbitrary text on vendor
> branches while refusing commits elsewhere if files contain conflict
> mark-ups?

Well, that's pretty easy, isn't it.  You never ever do any commits to
the vendor branch in the first place!  Obviously I'm not proposing that
"cvs import" reject files containing constructs that appear to be merge
conflict markers.  After all "cvs import" doesn't work with potentially
merged files and so it can safely assume that anything in the files it
handles is exactly verbatim what should be in them.

(If you mistakenly think you someday have to do a commit on the vendor
branch you're, well, mistaken.  You can always construct a "cvs import"
command to do the equivalent.  I know this because I've done it many
many times.)

                                                        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]