From owner-svn-src-all@freebsd.org Tue Mar 7 04:15:24 2017 Return-Path: Delivered-To: svn-src-all@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 81E6ED016D8; Tue, 7 Mar 2017 04:15:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x22e.google.com (mail-pg0-x22e.google.com [IPv6:2607:f8b0:400e:c05::22e]) (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 4E9061453; Tue, 7 Mar 2017 04:15:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x22e.google.com with SMTP id b129so74019705pgc.2; Mon, 06 Mar 2017 20:15:24 -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=fJTppxW4Ane78KNGznUp68xMotPCEFFwe1omBgU9Myg=; b=fI2A125rR2CRwYiSlacf5R7vZxtb0yxG9K4cdij0yhyw9C7zB2/nYQT7G71Wtd5wdI /lJnRpGwSObeeMf9I+em50+R0onZjoWleOVwUZcg8XWSMfUA+4kwpT1Y+P7w4D3IexVp OrqrC4Ve5wqYbrlCWzflwGrGN4eMHPyisC5lYdC66rIzcYD2itPLjodAR3ZyzQ1fl2Js FRPwcvWz+9jDvJoboR2DYivc2aYIo1P6aPaQwAqNVNW+EzeE/vNBR+p2vffaOm3n8eap wRXHl5dQLUtB9aQ9+UGcGzQ4lRBRgHTtprd/cs49hmqbcO4sdky6UolddoqAHTI1PmvI XW7w== 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=fJTppxW4Ane78KNGznUp68xMotPCEFFwe1omBgU9Myg=; b=JRmtxxCskayXpt7lNzxh9mqpaJ7ORzGL9DPMyUbo/c4uj2Etgk/uBV2r9fHWweQUMg sQ159/zvJBqeUnsLU478LTzI8/jffjw9MZmnbKxxVVcijybqCi9/BWikRfAk4VI7dks0 2/NM7ss8Hji554QP1GXZnJLTEoDne88o4VHhVC7+7vPZJof14mMwcInog8RurzZPJrhu basAJL0gmoxPbEmq69Uf/Y4LmaeeJn/HxdAMSDR501NJAapgv9kDMu/jlwtDJhEy1rVs SNH2N4Abgic2GiCYOOGsHcGMddqT3yrIm3E20ygZutVuzUDI5xT1BaRPdruuYH4rht4P SAAA== X-Gm-Message-State: AMke39mUaXJHPkluTzJXweMGmsl8eGZ+2swXbvxb4nX4PLkXZQf51NM9s/LS5oCfxOSfGQ== X-Received: by 10.98.223.76 with SMTP id u73mr25752266pfg.147.1488860123752; Mon, 06 Mar 2017 20:15:23 -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 e16sm11759972pfb.102.2017.03.06.20.15.23 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 20:15:23 -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=_7D4D5DC8-CC56-4FC5-B30F-2F2195B9A4C9"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <4778322D-C39C-4291-90A4-6575232A7A53@gmail.com> Date: Mon, 6 Mar 2017 20:15:22 -0800 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201703070413.v274DMEU039182@repo.freebsd.org> <4778322D-C39C-4291-90A4-6575232A7A53@gmail.com> To: Ngie Cooper X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 07 Mar 2017 04:15:24 -0000 --Apple-Mail=_7D4D5DC8-CC56-4FC5-B30F-2F2195B9A4C9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 6, 2017, at 20:14, Ngie Cooper (yaneurabeya) = wrote: >=20 >>=20 >> On Mar 6, 2017, at 20:13, Ngie Cooper wrote: >>=20 >> Author: ngie >> Date: Tue Mar 7 04:13:22 2017 >> New Revision: 314830 >> URL: https://svnweb.freebsd.org/changeset/base/314830 >>=20 >> Log: >> mergemaster: fix description of -p >>=20 >> -p only handles updating /etc/master.passwd and /etc/group . No more, >> no less. >>=20 >> Also, mergemaster (and no other portions of the vanilla FreeBSD build >> process) should be messing with __MAKECONF or SRCCONF as part of the >=20 > *should not Pfft. Stupid double-negative with =E2=80=9Cand no=E2=80=9D as well. Time to step away from the keyboard. -Ngie --Apple-Mail=_7D4D5DC8-CC56-4FC5-B30F-2F2195B9A4C9 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 iQIcBAEBCgAGBQJYvjPaAAoJEPWDqSZpMIYVHNEQAM67eDlLPqZZOKIqbSQCAZN+ A5UqUuiGV6OUJynKz9xMr9Xbd55Zq9xeF+tXOvL80JM5lGfRRCYOXqGvU48PkVBm KA6gQ/b7ruerf68czZ9RMNoET/KqFlVmG+72Cw1ZEqlcayAcibyfA6n9W2l/nese p+LcgA6MzvrAdsieN1nC/OmMCZs5zu2EQBqpbI+DZEALA6Jw/hnl9NqCT/Zhoapm H+cFIfXTnSe+Z8xOmvPac1shKUfDfsGlpORE2fKSqqxmyZkE5fMcMnw4ZJsRpZLs g8+Z4UzZAlEauMjxGtAbRwj4SjvrsHk/xEWtO8cdz8rIPdbBLkJYdNXwTuf49PYB IdxFtRWogpLPVGYDNdBcjC8Rs5iK0J+D+WAtx0IR8U/7ML8oMsRv/JrhCpw7LtFv M1drVFu+zxp/ixfk975S0VmOkI5y5Z56SG7/RXipQEBceZHrxtursoUxMfwcF7mx VbvNfRHJnQ9pDt4wktVl6fOwWX9Tgj6c8h+ZqzDzvC9XH7uV2haW9ptgldR8a9/N avEW7Emv6qZQx8a/diVMTzbTukC2ClcM3Qv5psEp0Ft8IIgEEGP3NmQ1dZyaxCTd jh1cNPOpijICRIB5K9uBOV58zGFjEZqV3hepY8lpPtw2WRqBLTr28WsWrcC9BXaw Rcs0V7KZuahBGsyLgSCe =9zLy -----END PGP SIGNATURE----- --Apple-Mail=_7D4D5DC8-CC56-4FC5-B30F-2F2195B9A4C9--