Date: Sun, 26 Aug 2018 22:18:18 -0700 From: Eitan Adler <lists@eitanadler.com> To: John Baldwin <jhb@freebsd.org> Cc: "freebsd-arch@freebsd.org" <freebsd-arch@freebsd.org> Subject: Re: upstream for contrib/tzcode/stdtme? Message-ID: <CAF6rxgnmV4p_Ljb18KNucSv%2BoXaAawGJi8HqRmODLcOv-==bRw@mail.gmail.com> In-Reply-To: <73a079ff-6bfd-150f-c67f-05f0f67b9aa0@FreeBSD.org> References: <C8E09003-E15D-4D68-B783-B0FD435454D0@freebsd.org> <abce970e-af0b-3f7b-3fcd-a77b5e7a1b50@FreeBSD.org> <CAF6rxgkOgBatF17%2Bak=8SqTVO9UrNr8qA6YSYQoZsRDnKAgUtA@mail.gmail.com> <20a85a8f-29a7-0d8f-64d1-9ba005ffe79c@FreeBSD.org> <CAF6rxg=iaKcGMGy=auXDwGTx-C7t702o__OdVPHWR5Yc88uzRg@mail.gmail.com> <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> <CAF6rxgm-YK546bP==0Yh0YU31%2BhkfU6O613j7vhPt%2BTDN0puVQ@mail.gmail.com> <7C8DB02A-8C15-4917-A941-A10DD2F3AB50@trouble.is> <8B61C2A5-DCEC-403A-B8F3-0B5BEF958612@freebsd.org> <CAF6rxgkx6Ej5gRaia8BD-0fwPHa5NGvhpAKXjxDLpvv5ox_XSQ@mail.gmail.com> <20180812233252.GD30769@rincewind.trouble.is> <CAF6rxgmxmbLeOmN-GoVL0aK5FgXwf1RXAnKSZbt9FOV9ErQyLA@mail.gmail.com> <73a079ff-6bfd-150f-c67f-05f0f67b9aa0@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 21 Aug 2018 at 02:13, John Baldwin <jhb@freebsd.org> 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. -- Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgnmV4p_Ljb18KNucSv%2BoXaAawGJi8HqRmODLcOv-==bRw>