From owner-cvs-all Mon Jan 17 5:19:32 2000 Delivered-To: cvs-all@freebsd.org Received: from relay.ucb.crimea.ua (UCB-Async4-CRISCO.CRIS.NET [212.110.129.130]) by hub.freebsd.org (Postfix) with ESMTP id 76B5414A14; Mon, 17 Jan 2000 05:19:12 -0800 (PST) (envelope-from ru@ucb.crimea.ua) Received: (from ru@localhost) by relay.ucb.crimea.ua (8.9.3/8.9.3/UCB) id PAA92327; Mon, 17 Jan 2000 15:18:38 +0200 (EET) (envelope-from ru) Date: Mon, 17 Jan 2000 15:18:38 +0200 From: Ruslan Ermilov To: Bruce Evans Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/texinfo/info signals.c src/contrib/texinfo/util install-info.c Message-ID: <20000117151838.C70086@relay.ucb.crimea.ua> References: <200001171050.CAA83525@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.95.3i In-Reply-To: ; from Bruce Evans on Mon, Jan 17, 2000 at 11:04:12PM +1100 X-Operating-System: FreeBSD 3.3-STABLE i386 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk On Mon, Jan 17, 2000 at 11:04:12PM +1100, Bruce Evans wrote: > On Mon, 17 Jan 2000, Ruslan Ermilov wrote: > > > ru 2000/01/17 02:50:36 PST > > > > Modified files: > > contrib/texinfo/info signals.c > > contrib/texinfo/util install-info.c > > Log: > > Merge our changes into GNU texinfo 4.0 > > > > Revision Changes Path > > 1.6 +68 -32 src/contrib/texinfo/info/signals.c > > 1.10 +954 -549 src/contrib/texinfo/util/install-info.c > > Don't you mean "merge changes from GNU texinfo 4.0 into our version" > (even if you actually merged the other way)? > CVS speaking, you are right, that's the way CVS works. Logically speaking (in terms of `cvs di -rVENDOR -rHEAD'), I think I am correct, because I first upgraded to texinfo-4.0 first and then merged local changes. In fact, I have completely reimplemented local changes for install-info.c. > The line counts show gnu changes, not ours. > Actually both, see the real diff for install-info.c. -- Ruslan Ermilov Sysadmin and DBA of the ru@ucb.crimea.ua United Commercial Bank, ru@FreeBSD.org FreeBSD committer, +380.652.247.647 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message