Re: Building on OS X

[Raphaël Berbain]

Timothy Larkin wrote:

> The problem has turned out to be the presence in 3 files of the lines
>
> <<<<<<< darwin.h
> =======
> >>>>>>> 1.10
>
> either in sequence or in close proximity.  Any idea why these lines 
> should appear?  They appear, for instance, in <darwin.h>, and I know 
> they are not legal C code.

They should not appear - at least, they should never stay for a long
time.

I know nothing about OS X, Darwin, or the Emacs source code base.
However, this strongly looks like a cvs unresolved conflict.  The text
that appears between '<<<<<<< darwin.h' and '=======' is the version
that was in a local darwin.h file, while the text between '======='
and '>>>>>>> 1.10' is the version that was in the cvs repository when
the conflict occured.

So either you modified your local copy of darwin.h in a way that cvs
was unable to merge with the repository version, in which case you
should resolve the conflict locally (which often means choosing the
right portion, but can be much trickier - if you are in this case
though, chances are big that you are quite familiar with this portion
of the code), or somebody else made that conflict appear, and checked
it in the cvs repository by mistake - and then it appeared in your
local version when you cvs update'd.  In this case, cvs log and
history commands can help you find who did it so it can be resolved
with its help - look for changes between revisions 1.10 and 1.11.

-- 
Raphaël
>From help-gnu-emacs-bounces@gnu.org  Fri Dec 27 11:00:09 2002
Path: 
shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!news.doit.wisc.edu!wiscnews.wiscnet.net!not-for-mail
From: Rodney Sparapani <rsparapa@mcw.edu>
Newsgroups: gnu.emacs.help
Date: Fri, 27 Dec 2002 09:41:27 -0600
Organization: Medical College of Wisconsin, Milwaukee
Lines: 10
Message-ID: <3E0C74A7.7060900@mcw.edu>
References: <tsl1-557673.10034226122002@newsstand.cit.cornell.edu>
        <tsl1-7FA5DE.10001127122002@newsstand.cit.cornell.edu>
NNTP-Posting-Host: markov.biostat.mcw.edu
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Trace: wiscnews.wiscnet.net 1041003688 23490 141.106.120.18 (27 Dec 2002
        15:41:28 GMT)
X-Complaints-To: usenet@wiscnews.wiscnet.net
NNTP-Posting-Date: 27 Dec 2002 15:41:28 GMT
User-Agent: Mozilla/5.0 (X11; U; SunOS sun4u; en-US;
        rv:1.0.1) Gecko/20020920 Netscape/7.0
X-Accept-Language: en-us, en
Xref: shelby.stanford.edu gnu.emacs.help:108510
To: help-gnu-emacs@gnu.org
Subject: Re: Building on OS X
X-BeenThere: help-gnu-emacs@gnu.org
X-Mailman-Version: 2.1b5
Precedence: list
List-Id: Users list for the GNU Emacs text editor <help-gnu-emacs.gnu.org>
List-Help: <mailto:help-gnu-emacs-request@gnu.org?subject=help>
List-Post: <mailto:help-gnu-emacs@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/help-gnu-emacs>,
        <mailto:help-gnu-emacs-request@gnu.org?subject=subscribe>
List-Archive: <http://mail.gnu.org/pipermail/help-gnu-emacs>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/help-gnu-emacs>,
        <mailto:help-gnu-emacs-request@gnu.org?subject=unsubscribe>
X-List-Received-Date: Fri, 27 Dec 2002 16:00:09 -0000

When you update via CVS, collisions are marked with diff/patch-like syntax.
So, you just need to remove those files that are giving you trouble and do
another update.

-- 
Rodney Sparapani              Medical College of Wisconsin
Sr. Biostatistician           Patient Care & Outcomes Research
rsparapa@mcw.edu              http://www.mcw.edu/pcor
Was 'Name That Tune' rigged?  WWLD -- What Would Lombardi Do