Date: Mon, 18 Jun 2018 10:08:28 -0700 From: John Baldwin <jhb@FreeBSD.org> To: Eitan Adler <lists@eitanadler.com> Cc: "freebsd-arch@freebsd.org" <freebsd-arch@freebsd.org> Subject: Re: upstream for contrib/tzcode/stdtme? Message-ID: <10e35d23-37d8-edf4-fa3b-9663bfdaa629@FreeBSD.org> In-Reply-To: <CAF6rxg=iaKcGMGy=auXDwGTx-C7t702o__OdVPHWR5Yc88uzRg@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>
next in thread | previous in thread | raw e-mail | index | archive | help
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. > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?10e35d23-37d8-edf4-fa3b-9663bfdaa629>