Date: Sun, 12 Aug 2018 20:36:23 +0800 From: "Philip Paeps" <philip@trouble.is> To: "Eitan Adler" <lists@eitanadler.com> Cc: "John Baldwin" <jhb@freebsd.org>, freebsd-arch@freebsd.org Subject: Re: upstream for contrib/tzcode/stdtme? Message-ID: <7C8DB02A-8C15-4917-A941-A10DD2F3AB50@trouble.is> In-Reply-To: <CAF6rxgm-YK546bP==0Yh0YU31%2BhkfU6O613j7vhPt%2BTDN0puVQ@mail.gmail.com> References: <CAF6rxg=rYVizBPFxxEr4M6uUymhAUq6qHgj-3N6uTubsTBO6pg@mail.gmail.com> <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>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2018-08-12 20:23:23 (+0800), Eitan Adler wrote: > On Mon, 18 Jun 2018 at 10:08, John Baldwin <jhb@freebsd.org> wrote: >> >> On 6/15/18 4:09 PM, Eitan Adler wrote: >>> On 15 June 2018 at 11:31, John Baldwin <jhb@freebsd.org> wrote: >>> >>>> I think this second approach is actually a better plan and is not >>>> quite what you >>>> were suggesting. >>>> >>>> That is, import the vendor bits corresponding to our existing code >>>> first into >>>> the vendor area, >>> >>>> then svn cp our existing files from libc, zic, etc. into the >>>> contrib/stdtime tree in the correct layout and do a single 'svn >>>> merge --record-only' >>>> merge to initialize the vendor mergeinfo. >>>> At that point you should be able to >>>> svn diff contrib/stdtime against the vendor/stdtime/dist to >>>> determine what local >>>> changes we have and start to think about them. > > Coming back to this. In r337683 and r337684 I imported a recent copy > of of TZDB. I was unable to find a copy of the 2010n distribution in > the original layout. That's because we split up the tzcode in our vendor area (for reasons I've never understood). As far as I know, there is no 1:1 mapping from any tzcode distribution to what we have in our repository. > The next step, if I understand, is to do the following: > cd /srv/srv/freebsd/svn/head/contrib > mkdir tzdb > cd tzdb > svn cp ../tzcode/stdtime/* . > svn cp ../tzcode/zic/* . > svn cp ../tzdata/* . > svn ci > (the above ignores duplicated files, but that's just expanding the > wildcards appropriately). > > After that: > svn merge --record-only '^/vendor/tzdb' . > > At this point we'll be able to diff contrib/tzdb and vendor/tzdb to > show the most current vendor code compared our, modified old code. > > Is this correct? Is this the optimal plan? I would really (really!) want to keep tzdata separate from tzcode and not make it any more difficult to update tzdata (which happens distressingly often). tzdata imports/updates are currently not a problem. And it's nice to be able to simply issue an errata notice only updating the zoneinfo files without touching the tzcode. The IANA tzdata project also distributes tzdata and tzcode separately. If you wanted to update tzcode, you could do it independently of tzdata. Philip -- Philip Paeps Senior Reality Engineer Ministry of Information
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7C8DB02A-8C15-4917-A941-A10DD2F3AB50>