Re: buildworld fails, can't guess why

From: Jeremie Le Hen <jeremie_at_le-hen.org>
Date: Tue, 7 Jun 2005 19:09:24 +0200
> > %%%
> >     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 >
Received on Tue Jun 07 2005 - 15:09:41 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:38:36 UTC