Date: Sat, 28 Jun 1997 23:21:44 -0700 From: Paul Traina <pst@shockwave.com> To: Steve Price <steve@FreeBSD.ORG> Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/patch ChangeLog Makefile.in NEWS acconfig.h backupfile.c common.h config.hin configure configure.in inp.c inp.h maketime.c mkinstalldirs partime.c patch.1 patch.c pch.c pch.h util.c util.h version.c version.h Message-ID: <199706290621.XAA24743@precipice.shockwave.com> In-Reply-To: Your message of "Sat, 28 Jun 1997 15:56:28 PDT." <199706282256.PAA24335@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Steve,
It doesn't look like you did this as an import, but rather as a commit
to the main branch. That means we've got a big nasty ugly problem on
our hands.
All updates to ANY stuff gotten from ANY vendor need to go on the vendor
branch.
I think, at this point, the best thing to do is rm -rf contrib/patch
from the repository and start over again with a clean import of 2.4.
This is Peter's call.
Paul
From: Steve Price <steve@FreeBSD.ORG>
Subject: cvs commit: src/contrib/patch ChangeLog Makefile.in NEWS
acconfig.h backupfile.c common.h config.hin configure configure.in
inp.c inp.h maketime.c mkinstalldirs partime.c patch.1 patch.c
pch.c pch.h util.c util.h version.c version.h
steve 1997/06/28 15:56:28 PDT
Modified files:
contrib/patch ChangeLog Makefile.in NEWS acconfig.h
backupfile.c common.h config.hin
configure configure.in inp.c inp.h
maketime.c mkinstalldirs partime.c
patch.1 patch.c pch.c pch.h util.c util.h
version.c version.h
Log:
Merge in changes for GNU patch version 2.4.
Pointed out by: Bruce Evans <bde@zeta.org.au>
Revision Changes Path
1.2 +219 -44 src/contrib/patch/ChangeLog
1.2 +17 -13 src/contrib/patch/Makefile.in
1.2 +49 -23 src/contrib/patch/NEWS
1.2 +3 -0 src/contrib/patch/acconfig.h
1.2 +2 -3 src/contrib/patch/backupfile.c
1.2 +20 -7 src/contrib/patch/common.h
1.2 +9 -0 src/contrib/patch/config.hin
1.2 +64 -28 src/contrib/patch/configure
1.2 +17 -3 src/contrib/patch/configure.in
1.2 +25 -111 src/contrib/patch/inp.c
1.2 +0 -0 src/contrib/patch/inp.h
1.2 +7 -4 src/contrib/patch/maketime.c
1.2 +0 -0 src/contrib/patch/mkinstalldirs
1.2 +0 -0 src/contrib/patch/partime.c
1.2 +352 -155 src/contrib/patch/patch.1
1.2 +220 -110 src/contrib/patch/patch.c
1.2 +148 -47 src/contrib/patch/pch.c
1.2 +2 -1 src/contrib/patch/pch.h
1.2 +246 -51 src/contrib/patch/util.c
1.2 +4 -2 src/contrib/patch/util.h
1.2 +0 -0 src/contrib/patch/version.c
1.2 +0 -0 src/contrib/patch/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706290621.XAA24743>