Date: Tue, 7 Jun 2005 19:09:24 +0200 From: Jeremie Le Hen <jeremie@le-hen.org> To: Steve Kargl <sgk@troutmask.apl.washington.edu> Cc: freebsd-current@freebsd.org, Jeremie Le Hen <jeremie@le-hen.org> Subject: Re: buildworld fails, can't guess why Message-ID: <20050607170924.GB41050@obiwan.tataz.chchile.org> In-Reply-To: <20050607165714.GA70495@troutmask.apl.washington.edu> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
> > %%% > > 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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050607170924.GB41050>