From owner-svn-src-all@freebsd.org Tue Dec 19 02:52:36 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 107F3EA36B2; Tue, 19 Dec 2017 02:52:36 +0000 (UTC) (envelope-from grog@lemis.com) Received: from www.lemis.com (www.lemis.com [208.86.226.86]) by mx1.freebsd.org (Postfix) with ESMTP id D8A637FAA4; Tue, 19 Dec 2017 02:52:35 +0000 (UTC) (envelope-from grog@lemis.com) Received: from eureka.lemis.com (lemis.com [192.109.197.81]) by www.lemis.com (Postfix) with ESMTP id 5D5F71B72806; Tue, 19 Dec 2017 02:52:34 +0000 (UTC) Received: by eureka.lemis.com (Postfix, from userid 1004) id 553D64494B1; Tue, 19 Dec 2017 13:52:33 +1100 (AEDT) Date: Tue, 19 Dec 2017 13:52:33 +1100 From: Greg 'groggy' Lehey To: Ed Maste Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326955 - stable/10/usr.bin/calendar/calendars Message-ID: <20171219025233.GG4376@eureka.lemis.com> References: <201712190102.vBJ12w2P010597@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RMedoP2+Pr6Rq0N2" Content-Disposition: inline In-Reply-To: Organization: The FreeBSD Project Phone: +61-3-5346-1370, +61-3-5309-0418 Mobile: 0401 265 606. Use only as instructed. WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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, 19 Dec 2017 02:52:36 -0000 --RMedoP2+Pr6Rq0N2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Monday, 18 December 2017 at 21:26:37 -0500, Ed Maste wrote: > On 18 December 2017 at 20:02, Greg Lehey wrote: >> Author: grog >> Date: Tue Dec 19 01:02:58 2017 >> New Revision: 326955 >> URL: https://svnweb.freebsd.org/changeset/base/326955 >> > ... >> Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday >> ============================================================================== >> --- stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 00:18:17 2017 (r326954) >> +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 01:02:58 2017 (r326955) >> @@ -356,7 +356,7 @@ >> 08/30 Victory Day in Turkey >> 08/31 Independence Day (Merdeka) in Malaysia >> 08/31 Independence Day in Trinidad and Tobago >> -08/31 Pashtoonian Day in Afghanistan >> +08/31 Pashtunistan Day in Afghanistan >> 08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) >> 09/01 Army Day in Chile >> 09/03 Independence Day in Qatar > > This appears to be a MFC of r323042 accidentally included in the > revert and without mergeinfo? Yes, I don't know how that happened. I followed the instructions in the committer's guide exactly. Presumably I should have specified the file explicitly (not in the guide), but I wasn't expecting any side effects. How would you like to handle it? Greg -- Sent from my desktop computer. Finger grog@FreeBSD.org for PGP public key. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft mail program reports problems, please read http://lemis.com/broken-MUA --RMedoP2+Pr6Rq0N2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlo4fvEACgkQIubykFB6QiMwzQCgiD77YZSrbauf5wLoyvd/3mFj 62MAnRRPSCysSDRS1ug/P0mz7nH2Nxfr =2ozc -----END PGP SIGNATURE----- --RMedoP2+Pr6Rq0N2--