From owner-svn-src-all@freebsd.org Fri Aug 17 16:13:03 2018 Return-Path: Delivered-To: svn-src-all@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 C695A1074234; Fri, 17 Aug 2018 16:13:03 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-it0-f53.google.com (mail-it0-f53.google.com [209.85.214.53]) (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 6993F865AB; Fri, 17 Aug 2018 16:13:03 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-it0-f53.google.com with SMTP id 72-v6so11975810itw.3; Fri, 17 Aug 2018 09:13:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=VLkhEGUVPz15PQNZQ+mGWWZeaKaxZt6lwOQtBi6DSXM=; b=luqQHstXxopJjNhD4V7mKQSqIUe9a8Ec1wQwgtafgfdrMdml+vzRC+Y6iYWv0YEMln h6YoocWojH02IaaOeyf7ErlTLXWSZgOo0x30qWY1v8PpYNr2YF7R67WBuV3ZMzK1mHeI l1rQ68VLbvg9mnK3RcPzEg3NNul9lu9Y/m3IXqLNNRun0+XOWxtHnYnRPtXvlWTs6cc0 +NTE8rU4YiwjIB0/VA4jbXCr6U6O9laBtNWA5F+6MaCYMrZ3fVm+664dTQqfMvTPfW/5 3L2zIiL3Sg21gMtcZPPl38M+6WMQrQqCpIMzwSRu8Ko1PAoBiRhqFqNPe8klnsSlo4ub K+xg== X-Gm-Message-State: AOUpUlFP9NX+iUmFXvcLUvzzJNLY8/Evg67CDzrMkBQHAv3YzY3Ziiy9 /vYnJdk1FR5kKrNZ1g+UX8OFGnHf X-Google-Smtp-Source: AA+uWPySSoJYy3IswFmEIfw0y69fAuNtd2Uo5ez4fQKf6DGb41xIKs7q+ek4xNKnptP6I1MPmT3vYg== X-Received: by 2002:a24:1013:: with SMTP id 19-v6mr4695361ity.141.1534522377558; Fri, 17 Aug 2018 09:12:57 -0700 (PDT) Received: from mail-it0-f46.google.com (mail-it0-f46.google.com. [209.85.214.46]) by smtp.gmail.com with ESMTPSA id o201-v6sm2023947ito.41.2018.08.17.09.12.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 09:12:57 -0700 (PDT) Received: by mail-it0-f46.google.com with SMTP id v71-v6so12429783itb.3; Fri, 17 Aug 2018 09:12:57 -0700 (PDT) X-Received: by 2002:a24:144:: with SMTP id 65-v6mr4535226itk.62.1534522377318; Fri, 17 Aug 2018 09:12:57 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 2002:a02:b472:0:0:0:0:0 with HTTP; Fri, 17 Aug 2018 09:12:56 -0700 (PDT) In-Reply-To: <3ffeebe7-07c5-bab2-d8c6-45d48adf662f@FreeBSD.org> References: <201808170023.w7H0Np0H027296@repo.freebsd.org> <3ffeebe7-07c5-bab2-d8c6-45d48adf662f@FreeBSD.org> From: Conrad Meyer Date: Fri, 17 Aug 2018 09:12:56 -0700 X-Gmail-Original-Message-ID: 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: John Baldwin Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 16:13:04 -0000 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. > 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