From owner-freebsd-current Sun Apr 2 15:37:05 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.10/8.6.6) id PAA14816 for current-outgoing; Sun, 2 Apr 1995 15:37:05 -0700 Received: from gndrsh.aac.dev.com (gndrsh.aac.dev.com [198.145.92.241]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id PAA14808 for ; Sun, 2 Apr 1995 15:37:03 -0700 Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.8/8.6.6) id PAA02659; Sun, 2 Apr 1995 15:36:38 -0700 From: "Rodney W. Grimes" Message-Id: <199504022236.PAA02659@gndrsh.aac.dev.com> Subject: Re: CVS conflict file in the latest sup To: Remy.Card@masi.ibp.fr (Remy CARD) Date: Sun, 2 Apr 1995 15:36:38 -0700 (PDT) Cc: current@FreeBSD.org In-Reply-To: <199504022100.XAA24074@ares.ibp.fr> from "Remy CARD" at Apr 2, 95 11:00:17 pm X-Mailer: ELM [version 2.4 PL23] Content-Type: text Content-Length: 864 Sender: current-owner@FreeBSD.org Precedence: bulk > > > Hi, > > During the latest sup, I got: > SUP Upgrade of lib at Sun Apr 2 22:59:18 1995 > SUP Fileserver 8.13 (4.3 BSD) 11291 on freefall.cdrom.com at 22:59:18 > SUP Requesting changes since Apr 2 05:22:47 1995 > SUP Using compressed file transfer > ... > SUP Receiving file lib/libc/rpc/.#clnt_udp.c.1.1 > ... > > I suppose that .#clnt_udp.c.1.1 has been created by CVS because of > a conflict on the clnt_udp.c source file. Could someone please fix this? Arghh.. someone some how managed to patch the sup area version of this file :-(. I have cleaned it up and reran supscan for the sys collection, you should be able to resup and have this cleaned up. Thanks for letting us know about it. -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Custom computers for FreeBSD