From owner-svn-src-head@freebsd.org Fri Aug 17 17:09:22 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AC271075C3B for ; Fri, 17 Aug 2018 17:09:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x234.google.com (mail-it0-x234.google.com [IPv6:2607:f8b0:4001:c0b::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3CBE8A48A for ; Fri, 17 Aug 2018 17:09:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x234.google.com with SMTP id v71-v6so12643581itb.3 for ; Fri, 17 Aug 2018 10:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=vc/4Y4fHcB3/MZuDJFgsL1927wU/97ozSgfbRh7bmjk=; b=NcS/olJv3fzDt7ou+h5ZSRbdV+8F/5pqNAmmdQWndbhXVgd08LnlqHOKWamktmRlEu AJSC0Ne9F6RhT2kNVHGLsk35VMiRcjjLtm/9lYwRPN3lCMp8brfsGui96hb+aR75VnHh xJIUEa+NYhT5/qrNhIZMUWWN3dOaaoX2waAXjkS0unp9IsHO/tKNs36icZCzhmB8hV3c oDNnM85zD5RYqNRSSCBiSAzz1R45E7/2lxRvFDksj0em1cXmX3q6b42NOgzfcQyRVZcC 4kYMHHBQ9qOsDjmzuIKAu3SI3Mefk0O3iZEuPKpfDDHsJswaKS6AZpl9psKveSooh240 dG/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=vc/4Y4fHcB3/MZuDJFgsL1927wU/97ozSgfbRh7bmjk=; b=kM943K54LaCN3b/L7X5kbQ1+wdd8cX2J0rIuKVv0gwSrQTS+KWrv0r6VAGkerxaYSq Gi1D9eUeHO+idfhwDkxeb/g/5VdzDZEskvJRVkL7pJknOb0QNvXbeb9UC7WVz27WO7bZ ZRC+wjOEoT1Rw1RAVVH/e9WXQZcOGZU+f8IZk/La/hYNwKl6ipXVqC4HDLYvmQgQuPyN VBDJRC7yr49U8+YfXIzaT5DhI0A0uwAgY2MuUz88Z9rU+0AipeGri6rPvNnjjVweffxV Wu5kWJL6klNwQ6zkWVP3fXJsMCbfQ59nSEVIDdoxTMAOzoH7XT5TIAIiQsSXQ1H6rdgG K7Ew== X-Gm-Message-State: AOUpUlHNbkDgrTDS0Qosu1v9Chg3Oo5zrnnF3/Sn7EVS/YkWHbrh8Kf+ +SjA+mwUbPKm5teQxYWAZN05aKz0hIHjRSEVmFIYdw== X-Google-Smtp-Source: AA+uWPxiEbutDLTfoHeN8cgYVb3A4RV95dMZOJ2PnoLZgMlXmxY9r8sFVlKQ2wdKvEBV1i6WWi6y3ywx1eYCtcmtzFg= X-Received: by 2002:a24:d2:: with SMTP id 201-v6mr5038483ita.60.1534525761206; Fri, 17 Aug 2018 10:09:21 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:85c2:0:0:0:0:0 with HTTP; Fri, 17 Aug 2018 10:09:20 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: References: <201808170023.w7H0Np0H027296@repo.freebsd.org> <3ffeebe7-07c5-bab2-d8c6-45d48adf662f@FreeBSD.org> From: Warner Losh Date: Fri, 17 Aug 2018 11:09:20 -0600 X-Google-Sender-Auth: tXGpdjLtu6xJ7lpbv0lDX6H1B6s Message-ID: 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... To: "Conrad E. Meyer" Cc: John Baldwin , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 17:09:22 -0000 On Fri, Aug 17, 2018 at 10:12 AM, Conrad Meyer wrote: > Hi John, > > On Thu, Aug 16, 2018 at 11:26 PM, John Baldwin 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. Unmodified imports are literally two additional svn commands, which hardly is a burden. > 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. Hope. The history of the project that has imported upstream stuff in the hope it never gets modified is littered with examples where it does. > 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. > This really isn't a 'playing nice with other' sort of answer. I don't think it's within the cultural norms of the project.You should reconsider this hostile attitude. Warner