From owner-svn-src-all@freebsd.org Fri Mar 15 02:39:34 2019 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 1975215389FB; Fri, 15 Mar 2019 02:39:34 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A955B82834; Fri, 15 Mar 2019 02:39:33 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f50.google.com with SMTP id x9so6974473iog.12; Thu, 14 Mar 2019 19:39:33 -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:references:in-reply-to:from:date :message-id:subject:to:cc; bh=caSF2vZImltydkatwx0U052d8+GeNxZYh+6GZzSyUAo=; b=HNsFkJE2UdhHuKEyOOCF1SOaVvkIyXp2pM9q2gM1A5hxYWep7TymUA3HbNz9UHj7Wx FhTVkUxcy8i3vdgT7juFiLAysDYyvS6yW356uAhFa3z/GXfW7dgO6p2q7sKGgtVv/A5s Yok1M04NnTTk1+h3eqzX7PUvDMpGc3ZOMtCMH0CWuOMvPi2uuHymYBpeSSfCmsgseOQN KMOOPFCFq+QSj5WJZwOkWIxleCUGJraMT5xZOf3YohGAO6Us/rYOsFffIyvLEQRUwHlW sGIRAV++Om87PMe7p4AH5OnVwe5i8/DxHMbp4r43tNtyBkoy6GFYvLD60xyePw+I3cSW w2VQ== X-Gm-Message-State: APjAAAV9rOFTwP2Ki89DexENPs4NVXl2IcgiMaGCv/gebsxWEXRt/YER 5/eHnAhJ//d1nVpc85owLbhmED0qH7F0XR8Z9ZrZiQ== X-Google-Smtp-Source: APXvYqxzXyGnK6h3SZpGj3PS5fjAb84fB9Q5c+zth+x2Q53u7zfYAao450G0vi2w0DL+8EIDn9MmN9ES3E76WTvwhA8= X-Received: by 2002:a6b:fb02:: with SMTP id h2mr804596iog.239.1552617566342; Thu, 14 Mar 2019 19:39:26 -0700 (PDT) MIME-Version: 1.0 References: <201903150205.x2F25qtD027856@gndrsh.dnsmgr.net> In-Reply-To: <201903150205.x2F25qtD027856@gndrsh.dnsmgr.net> From: Ed Maste Date: Thu, 14 Mar 2019 22:39:13 -0400 Message-ID: Subject: Re: svn commit: r345138 - head/share/man/man9 To: "Rodney W. Grimes" Cc: Warner Losh , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: A955B82834 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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, 15 Mar 2019 02:39:34 -0000 On Thu, 14 Mar 2019 at 22:05, Rodney W. Grimes wrote: > > How do the tools today deal with taking a binary off the vendor branch? > Isn't this still a for-ever night mare merge thing to deal with? There isn't really the concept of taking a file off the vendor branch in the same way as with CVS, although it's still prudent to limit changes to vendor/contrib files to avoid conflicts during future imports. Modifying binary contrib files is a different matter, but that would be difficult to deal with regardless of whether they're uuencoded or not. Anyway, I'm not aware of us having done that before.