Patrick Steinhardt <ps@xxxxxx> writes: > As support for Meson is still in-flight we have to accommodate for > conflicts with topics in "seen". The following conflicts are being > addressed in this commit: > > - ej/cat-file-remote-object-info adds t1017 and "fetch-object-info.c". > > - ds/path-walk-1 adds t6601 as well as "path-walk.c" and > "test-path-walk.c". > > - js/libgit-rust adds "common-exit.c" and "common-init.c". > > - ds/name-hash-tweaks adds "t/helper/test-name-hash.c". > > This is somewhat painful in the current state where Meson is not yet > part of the main tree, but we'll have to live with that for the time > being. > > I've split this commit out into a separate fixup-style commit such that > it is possible to test this topic both with and without "seen" merged > into it. You can simply revert this commit to test without "seen". Now I had to reconstruct these "fixup-style" commits and they appear under ref/merge-fix/ hierarchy in my broken-out repository published at https://github.com/gitster/git.git/ (and no other fallback URLs; it might make sense to have another repository for redundancy, but it is an unrelated tangent). In addition to these listed four, a newly added ds/backfill also needs refs/merge-fix/ds/backfill to adjust. What I noticed while performing this exercise to place ps/build~1 (i.e. the series without this step) immediately on top of where the history leading to 'seen' has a commit whose tree matches that of 'next' is that we need some "distributed" (read: put the burden on topic authors, not on the onwer of ps/build topic, and not on the maintainer) way to make sure various list of files in meson.build, t/meson.build, and t/helper/meson.build are in sync with corresponding list of files in the Makefile world. It _should_ be automatable in theory, and to help those who develop against the current practice of treating Makefile as the authoritative build system, a Makefile target that tells them that they added a new file to Makefile and removed a file from t/Makefile but they forgot to make corresponding changes to meson.build and t/meson.build files would be very beneficial. We could run that target as a part of "make test". Of course, those who care about keeping CMake build up to date can add something similar hooked up to help others help themselves.
