From owner-freebsd-arch@freebsd.org Mon Aug 27 16:17:46 2018 Return-Path: Delivered-To: freebsd-arch@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 641B9108F426 for ; Mon, 27 Aug 2018 16:17:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1083677B2D for ; Mon, 27 Aug 2018 16:17:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 130A210AFCD; Mon, 27 Aug 2018 12:17:38 -0400 (EDT) Subject: Re: upstream for contrib/tzcode/stdtme? To: Eitan Adler References: <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> <7C8DB02A-8C15-4917-A941-A10DD2F3AB50@trouble.is> <8B61C2A5-DCEC-403A-B8F3-0B5BEF958612@freebsd.org> <20180812233252.GD30769@rincewind.trouble.is> <73a079ff-6bfd-150f-c67f-05f0f67b9aa0@FreeBSD.org> Cc: "freebsd-arch@freebsd.org" From: John Baldwin Message-ID: <5aa63c28-8786-94d2-7aa8-a36deb83d377@FreeBSD.org> Date: Mon, 27 Aug 2018 09:17:38 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Mon, 27 Aug 2018 12:17:39 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 16:17:46 -0000 On 8/26/18 10:18 PM, Eitan Adler wrote: > On Tue, 21 Aug 2018 at 02:13, John Baldwin wrote: >>> This will leave contrib with the old code and vendor with the new code >>> and mergeinfo claiming we're fully merged. Is that the state of >>> affairs that we want? I don't know subversion well enough to >>> formulate a better plan. >> >> Can't you import the "current" version of tzcode into the vendor area >> (what we have now) and then diff against that once it is moved to see >> what local diffs we have that we still need vs don't need, then separately >> update the vendor area to the latest version and do a "normal" merge? > > I looked into this before importing the latest version. As far as I > could, the last time that tzcode was MFVed was in > > r200832 | edwin | 2009-12-22 11:17:10 +0000 (Tue, 22 Dec 2009) | 10 lines > MFV of tzdata2009t, r200831 > > There were some changes here: > r214411 | edwin | 2010-10-27 07:14:46 +0000 (Wed, 27 Oct 2010) | 32 lines > Sync code with tzcode2010m > > tzcode was tagged at tzcode2010n but I don't see it imported. > > When I compared tzcode2010m against what is presently in head I got a > large, although not incomprehensible, diff. That said, its similar in > size to the diff against the most recent version. > > Much of the changes arise from the xlocale changes from 2011. Even though the diff is large, having the baseline for vendor match means that doing an 'svn merge' of the latest tzcode will try to apply the right deltas to our current code. You will risk missing some of the vendor's changes I think if you try to resolve the diff of latest vendor against our current code by hand as in your original proposal. -- John Baldwin