[latex3-commits] [git/LaTeX3-latex3-luaotfload] master: adapt status (21625c6)

Ulrike Fischer fischer at troubleshooting-tex.de
Sun Nov 10 23:05:30 CET 2019


Repository : https://github.com/latex3/luaotfload
On branch  : master
Link       : https://github.com/latex3/luaotfload/commit/21625c66db4e35fcf3934f14117789ad09780049

>---------------------------------------------------------------

commit 21625c66db4e35fcf3934f14117789ad09780049
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Nov 10 23:05:30 2019 +0100

    adapt status


>---------------------------------------------------------------

21625c66db4e35fcf3934f14117789ad09780049
 buildinfo.txt                  | 10 +++++++-
 src/auto/luaotfload-status.lua | 54 +++++++++++++++++++++---------------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/buildinfo.txt b/buildinfo.txt
index a376512..e1004dc 100644
--- a/buildinfo.txt
+++ b/buildinfo.txt
@@ -99,7 +99,7 @@ The name contains the current date.
 
 !!! date must be naturally correct
 
--->  texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2019-08-11.lua
+-->  texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2019-10-29.lua
 
 
 ==============
@@ -146,3 +146,11 @@ texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2019-07-04.lua
 --> l3build ctan
 5. upload
  -->l3build upload
+
+
+=======
+I would do the merge to dev last because it is the least important step and the only
+step where we it is quite likely to get merge conflicts.
+So my order would be: Do a fast-forward merge to master, then set the tag.
+After the Tag tests ran through send the code to CTAN and delete the master-xx branch.
+Finally merge master back into dev.
diff --git a/src/auto/luaotfload-status.lua b/src/auto/luaotfload-status.lua
index 3221986..b4bad63 100644
--- a/src/auto/luaotfload-status.lua
+++ b/src/auto/luaotfload-status.lua
@@ -55,40 +55,40 @@ return {
   { "fontloader-reference.lua", "5be3565068a1929b173bde862b48a30e" },
   { "fontloader-basics-gen.lua", "b21e91bbd534f77e368f0ec13f865aed" },
   { "mktests", "c7cff7025962922944376acc1ffa9c47" },
-  { "mkstatus", "32b8eee5316ca3100e4434db79d08230" },
+  { "mkstatus", "1a9f8bbf36426071b6970678975360a9" },
   { "mkcharacters", "92c24bb582fc84c0365634f29eb89863" },
   { "mkglyphlist", "557836886d4f0e6d656eac3ded4456a2" },
   { "mkimport", "60e0b11a1a68719033e86a3e0f4d5e86" },
-  { "luaotfload-glyphlist.lua", "6dc41351ebdb122e044bed6d3fc2ca4b" },
+  { "luaotfload-glyphlist.lua", "bb67952ea9fb1c3766402457bd477629" },
   { "luaotfload-characters.lua", "593ce9dccf6ddc4f7d4be0514f581102" },
-  { "luaotfload-tounicode.lua", "b87cab857631c47f5c2bbfa4dc1b5598" },
-  { "luaotfload-unicode.lua", "eaf637834d735afce54cf81721b89626" },
-  { "luaotfload-resolvers.lua", "7bcd23bf0c4079174679f61c315f54ed" },
-  { "luaotfload-parsers.lua", "23b0550fcc6bf872714d882b8d15f465" },
-  { "luaotfload-multiscript.lua", "bd0b25f9b9b21ad1e1a24fb88dc5cdbf" },
-  { "luaotfload-loaders.lua", "34d130aa4e365639baecfa0481e34d13" },
-  { "luaotfload-harf-plug.lua", "59429664d9bebfbf0e0bfa8a8bdd85e3" },
-  { "luaotfload-harf-define.lua", "f0aafaecaddbc43f665a076195ed9205" },
-  { "luaotfload-notdef.lua", "ce00644d5801c6fac2e274626a52ecf2" },
-  { "luaotfload-embolden.lua", "7ff4b7e2970f2748a4d881b23085495d" },
-  { "luaotfload-letterspace.lua", "2b24d57529363de4a004510da84bafd9" },
-  { "luaotfload-features.lua", "b8c279955bcc473f02ad77b46942eb29" },
-  { "luaotfload-database.lua", "131587572dcf49769bec7e085ab61281" },
-  { "luaotfload-configuration.lua", "a59a94e07e20998144c91d5eb44b9302" },
-  { "luaotfload-colors.lua", "c13f4c88058e2c4869205ad015765070" },
-  { "luaotfload-auxiliary.lua", "77bcb55f9d215ad8a61701dc64e9a07e" },
-  { "luaotfload-filelist.lua", "96967c2f4ad091f2a8c74a50294c25d5" },
-  { "luaotfload-tool.lua", "9a53d4aedf71012530be90303aabe0d9" },
-  { "luaotfload-diagnostics.lua", "f521a2b70b24bd23fb23d3d08d7845bf" },
-  { "luaotfload-log.lua", "28c5c63d7af789ab7ca5757870dfc595" },
-  { "luaotfload-init.lua", "ebb2e936d4c95cab76649897f6af0e25" },
-  { "luaotfload-main.lua", "e4208f459c12b57a6996b4c7e9adbb8b" },
+  { "luaotfload-tounicode.lua", "f37eab5828b4aee392de359bf4d57027" },
+  { "luaotfload-unicode.lua", "861eb4a6332e0b7d8e757cab4759a734" },
+  { "luaotfload-resolvers.lua", "5d9e254413ba333a4f559be023355224" },
+  { "luaotfload-parsers.lua", "e1f4a54c2f29550d3c8ff18e19841ee4" },
+  { "luaotfload-multiscript.lua", "05d2f1c9a27afdbc4b9ad95f958cb6cb" },
+  { "luaotfload-loaders.lua", "cc475c8b04368d3f8ef6e52495fb579a" },
+  { "luaotfload-harf-plug.lua", "ec3ad02c41bd174aedc350dc4cabbc54" },
+  { "luaotfload-harf-define.lua", "7e85627ae64b749f41de5863d7c5ca86" },
+  { "luaotfload-notdef.lua", "23d514bea20fcb0343a8382537ab3924" },
+  { "luaotfload-embolden.lua", "bd0cd6e3951dab2862ca2d2dc1c6bccb" },
+  { "luaotfload-letterspace.lua", "352d83726eead3902323d451907aeb66" },
+  { "luaotfload-features.lua", "c60d2fcaab63dc338d9abd82176f96ee" },
+  { "luaotfload-database.lua", "3f126f3acdcf4b90f13d6c3c41b83147" },
+  { "luaotfload-configuration.lua", "fdb8f0e3b826e91b8598d4b4a387aaa5" },
+  { "luaotfload-colors.lua", "7f63ffde97bb798b63f2c94c5a7e474f" },
+  { "luaotfload-auxiliary.lua", "5e027ad1dde5655eaa74204cdb709098" },
+  { "luaotfload-filelist.lua", "3194c19d0618e4784711e87864e625ea" },
+  { "luaotfload-tool.lua", "3f989f7646d8df2aea584d2333cfb894" },
+  { "luaotfload-diagnostics.lua", "b31b30dd151cd2e6c359b56f4c9fd12c" },
+  { "luaotfload-log.lua", "30d00c154254ce70fe7c1a33692110e2" },
+  { "luaotfload-init.lua", "e22c43529440994d0c99734c736dbb65" },
+  { "luaotfload-main.lua", "9fc20061c7af28ccfcfb95a69115c3e4" },
  },
  ["notes"]={
   ["committer"]="Ulrike Fischer <fischer at troubleshooting-tex.de>",
-  ["description"]="v3.1/2019-11-04",
+  ["description"]="v3.11/2019-11-10",
   ["loader"]="fontloader-2019-10-29.lua",
-  ["revision"]="cdc212ae76bc0f839d116c8f66af98445ba9f307",
-  ["timestamp"]="2019-11-03 15:29:57 +0100",
+  ["revision"]="d2ab135f432eadbc68f529447aa47b906ff961ab",
+  ["timestamp"]="2019-11-10 21:29:47 +0100",
  },
 }
\ No newline at end of file





More information about the latex3-commits mailing list