From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: raphael.berbain@free.fr (=?iso-8859-1?q?Rapha=EBl?= Berbain) Newsgroups: gmane.emacs.help Subject: Re: Building on OS X Date: Fri, 27 Dec 2002 16:27:09 +0100 Organization: nil Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <85ptrn8otu.fsf@ID-110038.user.dfncis.de> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: main.gmane.org 1041004323 5259 80.91.224.249 (27 Dec 2002 15:52:03 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 27 Dec 2002 15:52:03 +0000 (UTC) Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18RwmG-0001MN-00 for ; Fri, 27 Dec 2002 16:52:01 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18Rwkg-0000w2-03 for gnu-help-gnu-emacs@m.gmane.org; Fri, 27 Dec 2002 10:50:22 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed.icl.net!newsfeed.fjserv.net!skynet.be!skynet.be!fu-berlin.de!uni-berlin.de!rberbain.net1.nerim.NET!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 36 Original-NNTP-Posting-Host: rberbain.net1.nerim.net (213.41.132.143) Original-X-Trace: fu-berlin.de 1041004063 7865272 213.41.132.143 (16 [110038]) Mail-Copies-To: nobody User-Agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.3.50 (i686-pc-linux-gnu) Cancel-Lock: sha1:uJmVrkj1IH2l6E1U6xBS+FfVZVQ= Original-Xref: shelby.stanford.edu gnu.emacs.help:108509 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:5038 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:5038 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 , 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