upstream for contrib/tzcode/stdtme?

[Eitan Adler]

On Mon, 18 Jun 2018 at 10:08, John Baldwin <jhb at freebsd.org> wrote:
>
> On 6/15/18 4:09 PM, Eitan Adler wrote:
> > On 15 June 2018 at 11:31, John Baldwin <jhb at 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.

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?








-- 
Eitan Adler