From owner-svn-src-head@freebsd.org Tue Mar 7 04:14:12 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFC32D0165D; Tue, 7 Mar 2017 04:14:12 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9DB0412C5; Tue, 7 Mar 2017 04:14:12 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x241.google.com with SMTP id v190so8782912pfb.0; Mon, 06 Mar 2017 20:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=7zogav+bctY+SGCeflJ1vEf40EvdMfTp45Uu1KnWmkQ=; b=C7a8z9ckln4SrVwbrYeTRWBOo8ZhPgUYc3pSSFups0M7NdWqt8TQENcLx7obMWSygd X89ALe3vDe6KdRLW7ZgCXB74BygtXPryx4v4or2Gn095DunqF2Bcq0DE55MJ9QNl7ZsY blZAV/RPo8F3EXB/TJN4XsSS6xOfIQAKL7oYqwKpsDUf9JzszJhMd6dkH/yIa6ZCpmB4 X5j1/shKiQiwmpP5GW8pLu7qpzN8m8Jj7X8PjTnM7aZuJ3GFYJzsmL99PwWJtj534+oR q3w1IX5QtX6usAm92sGJADkGgSDb1HdGymAeJ1Z03rANvc0jk0Kxqg0TdYBD3koNHtW2 eMbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=7zogav+bctY+SGCeflJ1vEf40EvdMfTp45Uu1KnWmkQ=; b=CUnyNUHZbHC7twXdfBA18tV1jsVvv8ZeWJ7wwNuvgx2JvM/dxVM+SIxK8ZL8qv5HPX e5DVKOQNvxZVdQh9lX52/1WVHDJeGhkA04+/mzWJVtx5PST5BDC+KtMv9qevWCBlNGTU bY3p+29GcfkyQqXDNF90VdpmaxLSugwIYlg+JH9SD+/rCKreENAqG/6PDJytkzsSI+/r cy5RGcixBmwxCE3Wt8DwDiXDZsPVh8/e/DrQh2hFEsZ9W3uGkH7XEGyMXt/WukQUdD6j ceCY7QMvwv2X9d1BrZwAleqg/kYnptPtXJg1ROOYLNEpAyPAkmdb/RXl0FfIMjxQFNAC cU9Q== X-Gm-Message-State: AMke39moFEAQsH0HZ1sFibMVr3IZhEkilEwY1v6TmVY/qtgZU7InIURyZh5B8By+MYmUvw== X-Received: by 10.98.23.202 with SMTP id 193mr25554138pfx.141.1488860052092; Mon, 06 Mar 2017 20:14:12 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id q7sm42236578pfb.98.2017.03.06.20.14.11 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 20:14:11 -0800 (PST) Subject: Re: svn commit: r314830 - head/usr.sbin/mergemaster Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_C47541B9-53AC-43B6-8AEA-F4E01B997476"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201703070413.v274DMEU039182@repo.freebsd.org> Date: Mon, 6 Mar 2017 20:14:10 -0800 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <4778322D-C39C-4291-90A4-6575232A7A53@gmail.com> References: <201703070413.v274DMEU039182@repo.freebsd.org> To: Ngie Cooper X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 07 Mar 2017 04:14:12 -0000 --Apple-Mail=_C47541B9-53AC-43B6-8AEA-F4E01B997476 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On Mar 6, 2017, at 20:13, Ngie Cooper wrote: > > Author: ngie > Date: Tue Mar 7 04:13:22 2017 > New Revision: 314830 > URL: https://svnweb.freebsd.org/changeset/base/314830 > > Log: > mergemaster: fix description of -p > > -p only handles updating /etc/master.passwd and /etc/group . No more, > no less. > > Also, mergemaster (and no other portions of the vanilla FreeBSD build > process) should be messing with __MAKECONF or SRCCONF as part of the *should not Bleh. -Ngie --Apple-Mail=_C47541B9-53AC-43B6-8AEA-F4E01B997476 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYvjOSAAoJEPWDqSZpMIYVqYwP/jfrB8tX6EbQ9owW3HqDYANu CJt4elzkjnBp/2fpiFprhhUEkzFza5mPGYYfKDYazsa9CUGhr+B4txSUDNWjQk1a AQoR+yqLmBt40HbQWHef/4Zr8edPKwgTn5t/PwczQz4Q7KX+e0yb/p1Fr2lGNUse HMsTw0h3zZNN+PWyTvk9AdF1JtWpB+EY9c4FLSuPvAMMSPRVD5nNjqEC6uveAHSB /zFJ0/dV0Kcu2SopvTQubAS8LHLsml5ff8XhNfR0VbAR0R+dxaj0A5JmSefYayeB if6n91chEvQR9G9sDb8CCb9SfbphG2TlkZd5URC5yM+d9oGMklrjwhRBITE5rrkT OSbQ+0p5yxV/KaYEvMb0XCuKrd81+yI8SYzsaSnnMGbuJ07DC/iyATPqYQzH74F1 D5h9BAUafu8vjA5TDdDfmjKY55IyvJ+ho/SdZgfXx1PCCe/Sv8ruE4dxiEr2G9Ur cttAFyZJpknYf/cAhkd6KmpqWomCI5pEeiQW3Ajfc4AskwhX7vmHncTUUApP+cZ5 BI47yO02RW8GgWIKg5W+N8an+pUAxPzd1m+LUYGBy6wubWrlcflxJqvXqYHQSRjC OpzM5BP3mnnAp6q3aYbHhW54lr4pI73GLP0uMMmQdi4YiJz0O34c/fXJ4Y+qzx6B GHs8K3afl8ARD5PKC1KU =5npV -----END PGP SIGNATURE----- --Apple-Mail=_C47541B9-53AC-43B6-8AEA-F4E01B997476--