Date: Tue, 19 Dec 2017 13:52:33 +1100 From: Greg 'groggy' Lehey <grog@FreeBSD.org> To: Ed Maste <emaste@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, 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> In-Reply-To: <CAPyFy2A7niW1TxdnzM=Cm%2Boxt3%2BV%2B84BQtennRG_faWR13e80Q@mail.gmail.com> References: <201712190102.vBJ12w2P010597@repo.freebsd.org> <CAPyFy2A7niW1TxdnzM=Cm%2Boxt3%2BV%2B84BQtennRG_faWR13e80Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <grog@freebsd.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171219025233.GG4376>