Based on the discussion on the mailing list, we'd like to rebase our ("lite") branch on top of the upstream to have a clear picture of how we differ from upstream, clean up the differences (remove useless cruft which obscures view and complicated maintenance/upgrades to new versions), and clean our local cruft too.
The work is now done, and lives in "lite-rebase" branch. To help reviewing it, I'm posting this "review", as a diff between master and the newly rebased branch. I'm not sure it helps much with that review, as even with my cruft-removing and related-minor-commits-squashing measures, there're still 104 commits on top of master. At the very least, it allows to quickly see cumulative changes to the key files (like docker-compose.yaml and Makefile) and assess that they are reasonable. (But the whole point of the rebase was to make sure that interim changes to the key files we share with upstream are also reasonable, and reviewing that might be easier in local git work copy.)
Based on the discussion on the mailing list, we'd like to rebase our ("lite") branch on top of the upstream to have a clear picture of how we differ from upstream, clean up the differences (remove useless cruft which obscures view and complicated maintenance/upgrades to new versions), and clean our local cruft too.
The work is now done, and lives in "lite-rebase" branch. To help reviewing it, I'm posting this "review", as a diff between master and the newly rebased branch. I'm not sure it helps much with that review, as even with my cruft-removing and related-minor-commits-squashing measures, there're still 104 commits on top of master. At the very least, it allows to quickly see cumulative changes to the key files (like
docker-compose.yaml
andMakefile
) and assess that they are reasonable. (But the whole point of the rebase was to make sure that interim changes to the key files we share with upstream are also reasonable, and reviewing that might be easier in local git work copy.)