upstream for contrib/tzcode/stdtme?
Eitan Adler
lists at eitanadler.com
Mon Aug 27 05:18:46 UTC 2018
On Tue, 21 Aug 2018 at 02:13, John Baldwin <jhb at 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
More information about the freebsd-arch
mailing list