cvs commit: src/sys/contrib/dev/acpica acdos16.h actbl71.h dbdisasm.c exdyadic.c exmonad.c psfind.c

[Nate Lawson]

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