From owner-freebsd-current Thu Dec 5 11:13:54 2002 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 E7E7D37B401; Thu, 5 Dec 2002 11:13:52 -0800 (PST) Received: from ambrisko.com (adsl-64-174-51-42.dsl.snfc21.pacbell.net [64.174.51.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 652E743EC2; Thu, 5 Dec 2002 11:13:52 -0800 (PST) (envelope-from ambrisko@www.ambrisko.com) Received: from www.ambrisko.com (localhost [127.0.0.1]) by ambrisko.com (8.12.6/8.12.6) with ESMTP id gB5JDd4p045544; Thu, 5 Dec 2002 11:13:39 -0800 (PST) (envelope-from ambrisko@www.ambrisko.com) Received: (from ambrisko@localhost) by www.ambrisko.com (8.12.6/8.12.6/Submit) id gB5JDcZ3045543; Thu, 5 Dec 2002 11:13:38 -0800 (PST) From: Doug Ambrisko Message-Id: <200212051913.gB5JDcZ3045543@www.ambrisko.com> Subject: Re: CVSup Delete failures In-Reply-To: <3DEF9846.3030905@tenebras.com> To: Michael Sierchio Date: Thu, 5 Dec 2002 11:13:38 -0800 (PST) Cc: Forrest Aldrich , freebsd-stable@FreeBSD.ORG, freebsd-current@FreeBSD.ORG X-Mailer: ELM [version 2.4ME+ PL94b (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Michael Sierchio writes: | Forrest Aldrich wrote: | > FYI, over the last few days, I've been seeing this error while doing a | > CVSUP of the code for both FreeBSD-STABLE (4.7) and Current: | > | > Delete src/contrib/gcc/INSTALL | > Cannot delete "/usr/local/src/freebsd/5.0/src/contrib/gcc/INSTALL": | > Directory not empty The problem seems to be an INSTALL directory now in HEAD and a file in Attic/INSTALL. cvs co of -stable is also barfing on this conflict of the old file and new directory.o U src/contrib/gcc/xcoffout.c U src/contrib/gcc/xcoffout.h cvs [checkout aborted]: could not chdir to src/contrib/gcc/INSTALL: Not a directory a21p% Removing the INSTALL directory in my local repo fixes the issue for -stable. Doug A. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message