Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Aug 2018 09:12:56 -0700
From:      Conrad Meyer <cem@freebsd.org>
To:        John Baldwin <jhb@freebsd.org>
Cc:        src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,  svn-src-head@freebsd.org
Subject:   Re: svn commit: r337936 - in head/sys/contrib/libsodium: . builds builds/msvc builds/msvc/build builds/msvc/properties builds/msvc/vs2010 builds/msvc/vs2010/libsodium builds/msvc/vs2012 builds/msvc/vs2...
Message-ID:  <CAG6CVpV75UO%2Bpt0r3AD83ZYCi0Ts%2BCqrbSxUqr2iPJXw-u4vBw@mail.gmail.com>
In-Reply-To: <3ffeebe7-07c5-bab2-d8c6-45d48adf662f@FreeBSD.org>
References:  <201808170023.w7H0Np0H027296@repo.freebsd.org> <3ffeebe7-07c5-bab2-d8c6-45d48adf662f@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi John,

On Thu, Aug 16, 2018 at 11:26 PM, John Baldwin <jhb@freebsd.org> wrote:
> On 8/17/18 1:23 AM, Conrad Meyer wrote:
>> Author: cem
>> Date: Fri Aug 17 00:23:50 2018
>> New Revision: 337936
>> URL: https://svnweb.freebsd.org/changeset/base/337936
>>
>> Log:
>>   Bring in libsodium to sys/contrib
>> ...
>
> Can you import this into the vendor area and then do a bootstrap of
> mergeinfo to sys/contrib?

To what benefit?  Our vendor process doubles or triples the work
required to update vanilla 3rd party sources like this.

> This permits future updates to use svn to
> merge instead of doing it by hand.

What merge?  Simply svn delete the directory, copy in the new one, svn
add it, and commit.

svn merges may be helpful if we plan on carrying a diff, but we don't
today, I do not plan to, and I hope we can avoid doing so.

> It also permits future imports to
> be done by other developers following our standard, documented process
> for working with third-party code.

As-is, future imports can be done by other developers without having
to reference a document and perform 3 different SVN commits.  Just
drop it in and go.

If someone wants to figure out the vendor glue to have that match
this, great, but I'm not really seeing the benefit.

Best regards,
Conrad



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpV75UO%2Bpt0r3AD83ZYCi0Ts%2BCqrbSxUqr2iPJXw-u4vBw>