upstream for contrib/tzcode/stdtme?

[John Baldwin]

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.
> 
> At this point both vendor and contrib have the same files, same
> layout, but possibly different content?

Yes.  The different content would be our local changes.

> How do we do the update itself then? "svn merge" from the vendor area
> into contrib?

Yes, just like a normal vendor update.

-- 
John Baldwin