On Sun, Jan 08, 2023 at 04:06:07AM +0000, Chris Morley wrote: > AFAICT the code (I didn't look at the docs mind you) is fixed. > What is actually broken in master now? > What are we trying to fix? The history?
Content of changes in 2.9 were discarded, instead of being added to master. This includes documentation fixes. I hope you will respect that just like code changes, documentation changes are valuable contributions to this project. For a list of changes between master and jepler/alternate-bad-merge-fix see https://gist.github.com/jepler/86390ab9be17babf0349a1a8c5198e2e -- these represent changes in 2.9 that were NOT taken by the bad merge commit but probably should have been. The majority are documentation changes (which does not mean they are lower value than code changes). That said, a lot of code changes were discarded too. For instance, an entire config is missing. As far as source code goes it looks like bugfixes to gremlin, qtvcp, and others are missing. To get an idea this "git diff --stat" summary of differences in lib/ src/ bin/ and scripts/ provides an overview: lib/python/glnav.py | 4 +- lib/python/qtvcp/qt_pstat.py | 5 +- .../qtvcp/widgets/camview_widget.py | 4 +- lib/python/qtvcp/widgets/round_gauge.py | 13 +- .../qtvcp/widgets/round_progress.py | 2 +- lib/python/vismach.py | 2 +- scripts/linuxcnc.in | 4 +- src/Makefile | 3 +- src/emc/canterp/Submakefile | 16 +- src/emc/rs274ngc/interp_base.cc | 29 +- src/emc/task/emctask.cc | 4 + .../axis/extensions/emcmodule.cc | 22 +- src/emc/usr_intf/gmoccapy/getiniinfo.py | 12 + .../usr_intf/gmoccapy/gmoccapy.glade | 255 +++++++++---- src/emc/usr_intf/gmoccapy/gmoccapy.py | 76 +++- .../usr_intf/gmoccapy/notification.py | 7 +- .../usr_intf/gmoccapy/release_notes.txt | 14 +- src/hal/components/axistest.comp | 2 +- src/hal/components/bldc.comp | 161 ++++----- src/hal/components/feedcomp.comp | 6 +- src/hal/components/gantry.comp | 34 +- src/hal/components/lut5.comp | 14 +- src/hal/components/moveoff.comp | 146 ++++---- src/hal/components/multiswitch.comp | 7 +- src/hal/components/panelui.c | 2 +- src/hal/components/plasmac.comp | 10 +- src/hal/components/spindle.comp | 84 ++--- src/hal/components/xyzab_tdr_kins.comp | 257 ++++++++++++++ src/hal/user_comps/vismach/Submakefile | 3 +- .../user_comps/vismach/xyzab-tdr-gui.py | 225 ++++++++++++ src/libnml/os_intf/_sem.c | 2 +- src/rtapi/uspace_rtapi_app.cc | 4 +- Jeff _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
