Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Apr 1995 23:00:17 +0200 (MET DST)
From:      Remy.Card@masi.ibp.fr (Remy CARD)
To:        current@FreeBSD.org
Subject:   CVS conflict file in the latest sup
Message-ID:  <199504022100.XAA24074@ares.ibp.fr>

next in thread | raw e-mail | index | archive | help

	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?

	Thanks

		Remy



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199504022100.XAA24074>