From owner-freebsd-current@FreeBSD.ORG Tue Jun 7 17:09:41 2005 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31ABD16A41C for ; Tue, 7 Jun 2005 17:09:41 +0000 (GMT) (envelope-from tataz@tataz.chchile.org) Received: from postfix4-2.free.fr (postfix4-2.free.fr [213.228.0.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id D382943D5C for ; Tue, 7 Jun 2005 17:09:40 +0000 (GMT) (envelope-from tataz@tataz.chchile.org) Received: from tatooine.tataz.chchile.org (vol75-8-82-233-239-98.fbx.proxad.net [82.233.239.98]) by postfix4-2.free.fr (Postfix) with ESMTP id 9919C31DA4B; Tue, 7 Jun 2005 19:09:39 +0200 (CEST) Received: by tatooine.tataz.chchile.org (Postfix, from userid 1000) id 6EF68407E; Tue, 7 Jun 2005 19:09:24 +0200 (CEST) Date: Tue, 7 Jun 2005 19:09:24 +0200 From: Jeremie Le Hen To: Steve Kargl Message-ID: <20050607170924.GB41050@obiwan.tataz.chchile.org> References: <20050607155130.GX41050@obiwan.tataz.chchile.org> <20050607163226.GA70231@troutmask.apl.washington.edu> <20050607164455.GZ41050@obiwan.tataz.chchile.org> <20050607165714.GA70495@troutmask.apl.washington.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050607165714.GA70495@troutmask.apl.washington.edu> User-Agent: Mutt/1.5.9i Cc: freebsd-current@freebsd.org, Jeremie Le Hen Subject: Re: buildworld fails, can't guess why X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2005 17:09:41 -0000 > > %%% > > coyote:src# cvs -Rd /nfs/donald/repo/FreeBSD status Makefile > > =================================================================== > > File: Makefile Status: Up-to-date > > > > Working revision: 1.318 Sun Mar 6 00:30:16 2005 > > Repository revision: 1.318 /nfs/donald/repo/FreeBSD/src/Makefile,v > > Sticky Tag: (none) > > Sticky Date: 2005.06.07.08.00.00 > > Sticky Options: (none) > > %%% > > It looks like your *.mk files in src/ are inconsistent are your > Makefile in lib/libstand may be out of date. Do you have > # $FreeBSD: src/lib/libstand/Makefile,v 1.54 2005/06/03 06:55:22 obrien Exp $ I think you got the point. CVS tells me I have unresolved conflicts on this file, but I don't understand how this can be, as I ever neither touched this file or applied a patch which could modify this (I'm not really interested in libstand). The file seems very old : # $FreeBSD: src/lib/libstand/Makefile,v 1.43 2004/07/01 00:01:26 tjr Exp $ I removed it and updated it again. This should work well, I'll keep you informed if things are still wrong. Do you know how I could determine all files with unresolved conflicts, without coding an ugly shell script ? Thank you very much for your help Steve. Best regards, -- Jeremie Le Hen < jeremie at le-hen dot org >< ttz at chchile dot org >