Hi,
On 2023/04/17 5:46, Nikita wrote:
Module Name: src
Committed By: nikita
Date: Sun Apr 16 20:46:18 UTC 2023
Modified Files:
src/distrib/sets/lists/base: ad.aarch64 mi shl.mi
src/distrib/sets/lists/debug: shl.mi
src/doc: 3RDPARTY CHANGES
src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in
src/external/mit/lua/dist: Makefile README README.import
src/external/mit/lua/dist/doc: contents.html lua.1 manual.html
readme.html
src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c
lauxlib.h lbaselib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h
ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h
lgc.c lgc.h linit.c liolib.c ljumptab.h llex.c llex.h llimits.h
lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c
lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h
lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c
ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h
lutf8lib.c lvm.c lvm.h lzio.c lzio.h
src/external/mit/lua/lib/liblua: Makefile shlib_version
src/share/mk: bsd.lua.mk
src/sys/modules/examples/luahello: luahello.lua
src/sys/modules/lua: Makefile
Removed Files:
src/external/mit/lua/dist/src: lbitlib.c
Log Message:
Resolve conflicts for lua 5.4.4 import.
Adjust various files for lua 5.4.4.
...
diffs are larger than 1MB and have been omitted
Thank you very much for working on this field!
Please consider to split this kind of commits into two parts:
(1) merge for "extern/.../dist", and
(2) glue parts outside "dist".
Diffs larger than 1MB are omitted for source-changes-full@, and it makes us
difficult to understand why and how ad.aarch64 was modified, for example.
Also, why did you remove copyright notice in luahello.lua? IIUC, this
should be agreed by the copyright holder, even if the code in problem
seems trivial.