svn commit: r326955 - stable/10/usr.bin/calendar/calendars

[Greg 'groggy' Lehey]

On Monday, 18 December 2017 at 21:26:37 -0500, Ed Maste wrote:
> On 18 December 2017 at 20:02, Greg Lehey <grog at 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 at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-stable-10/attachments/20171219/f71938c8/attachment.sig>