From owner-cvs-all Mon Apr 15 10:50:32 2002 Delivered-To: cvs-all@freebsd.org Received: from columbus.cris.net (columbus.cris.net [212.110.128.65]) by hub.freebsd.org (Postfix) with ESMTP id 6E20737B405; Mon, 15 Apr 2002 10:50:20 -0700 (PDT) Received: from ark.cris.net (root@ark.cris.net [212.110.128.68]) by columbus.cris.net (8.9.3/8.9.3) with ESMTP id UAA82951; Mon, 15 Apr 2002 20:50:15 +0300 (EEST) Received: (from phantom@localhost) by ark.cris.net (8.11.1/8.11.1) id g3FHoFu84980; Mon, 15 Apr 2002 20:50:15 +0300 (EEST) Date: Mon, 15 Apr 2002 20:50:15 +0300 From: Alexey Zelkin To: Doug Barton Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, ru@FreeBSD.org, ache@FreeBSD.org Subject: Re: cvs commit: src/etc locale.deprecated Message-ID: <20020415205015.A82862@ark.cris.net> References: <200204150754.g3F7sKW33130@freefall.freebsd.org> <20020415102730.H266-100000@master.gorean.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: <20020415102730.H266-100000@master.gorean.org>; from DougB@FreeBSD.org on Mon, Apr 15, 2002 at 10:30:21AM -0700 X-Operating-System: FreeBSD 3.5-STABLE i386 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG hi, On Mon, Apr 15, 2002 at 10:30:21AM -0700, Doug Barton wrote: > Your version of the "correct behavior" differs with that of the > file in -current. The traditional model of development for the project is > to test correct behavior in -current, and then merge it to -stable. This > file seems to be an exception to that rule. I've cc'ed the other two > contributors to this file, hopefully y'all can work this out. 1. Actually I am author 2. All work was done in -CURRENT there're quite few compatibility shims present in -CURRENT, but since intermediate work was not MFCed there's no need to MFC compatibility shims. 3. All changes related to this stuff were carefully tested against different versions of RELENG_4, so I merged as much stuff as required. Anyway, I could agree on adding some stuff from -CURRENT (but there's no purpose to do it due to [2]), but can't agree with removing (you did in rev 1.2.2.5). > On Mon, 15 Apr 2002, Alexey Zelkin wrote: > > > phantom 2002/04/15 00:54:20 PDT > > > > Modified files: (Branch: RELENG_4) > > etc locale.deprecated > > Log: > > Backout previous revision, i.e. restore correct behaviour. > > > > Revision Changes Path > > 1.2.2.6 +5 -3 src/etc/locale.deprecated > > > > http://www.FreeBSD.org/cgi/cvsweb.cgi/src/etc/locale.deprecated.diff?&r1=1.2.2.5&r2=1.2.2.6&f=h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message