From owner-cvs-src@FreeBSD.ORG Thu Dec 11 14:53:00 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A46416A4CE for ; Thu, 11 Dec 2003 14:53:00 -0800 (PST) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id D57AB43D9A for ; Thu, 11 Dec 2003 14:52:57 -0800 (PST) (envelope-from nate@rootlabs.com) Received: (qmail 51048 invoked by uid 1000); 11 Dec 2003 22:52:59 -0000 Date: Thu, 11 Dec 2003 14:52:59 -0800 (PST) From: Nate Lawson To: David O'Brien In-Reply-To: <20031210172827.GA44839@dragon.nuxi.com> Message-ID: <20031211144904.L50937@root.org> References: <20031209023033.C2D6D16A4DB@hub.freebsd.org> <20031208224155.Y40724@root.org> <20031210172827.GA44839@dragon.nuxi.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/dev/acpica acdos16.h actbl71.h dbdisasm.c exdyadic.c exmonad.c psfind.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2003 22:53:00 -0000 On Wed, 10 Dec 2003, David O'Brien wrote: > On Mon, Dec 08, 2003 at 10:46:12PM -0800, Nate Lawson wrote: > > On Mon, 8 Dec 2003, Nate Lawson wrote: > > > Removed files: (Branch: INTEL) > > > sys/contrib/dev/acpica acdos16.h actbl71.h dbdisasm.c > > > exdyadic.c exmonad.c psfind.c > > > Log: > > > Remove files on the vendor branch that we no longer use. Some are no longer > > > distributed with ACPI-CA. Note that all of these have been gone from HEAD > > > since 20030228. > > > > > > Revision Changes Path > > > 1.1.1.3 +0 -152 src/sys/contrib/dev/acpica/acdos16.h (dead) > > > 1.1.1.6 +0 -238 src/sys/contrib/dev/acpica/actbl71.h (dead) > > > 1.1.1.12 +0 -869 src/sys/contrib/dev/acpica/dbdisasm.c (dead) > > > 1.1.1.11 +0 -939 src/sys/contrib/dev/acpica/exdyadic.c (dead) > > > 1.1.1.11 +0 -1083 src/sys/contrib/dev/acpica/exmonad.c (dead) > > > 1.1.1.15 +0 -485 src/sys/contrib/dev/acpica/psfind.c (dead) > > > > I'm not sure I did this right since it didn't have the intended effect > > exactly. When I do... > > > > cvs diff -r INTEL src/sys/contrib/dev/acpica > > > > ... I see these files as deleted. So I thought by deleting them on the > > vendor branch, as well as on HEAD, > > Don't delete them on HEAD, only the vendor branch if you've never > committed to them. I think they haven't been committed to but I'm not sure from the history. See below: http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/contrib/dev/acpica/Attic/acdos16.h In any case, even after being deleted on both HEAD and the vendor branch, they still show up in a cvs diff against the vendor branch (command line above). Suggestions? -Nate