Re: [Emc-developers] pncconf discrepancy between 2.8 and 2.9
Am 30.11.22 um 11:24 schrieb andy pugh: pins.c, hostmot2.h, hostmot2.c, release_notes.txt, hostmot2.9, hm2_eth.9 changelog and VERSION should all be resolved by --ours. For release_notes.txt please accept both changes but in reverse order, so that it look like this - fixed sensitizing of user tab button on toggling "edit offsets" (#2111) - fix error on creating new G-code file when RS274NGC_STARTUP_CODE is not set (#2057) ver 3.4.0 New features: ... -- Am 02.12.22 um 11:23 schrieb andy pugh: On Fri, 2 Dec 2022 at 04:38, Sebastian Kuzminsky wrote: I'm merging 2.8 into 2.9, and I came across a spot where it looks like a feature was added independently to both 2.8 and 2.9 (7i96s support in pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8. I was going to do that merge too, as I am responsible for the somewhat unusual process. In fact I planned it for yesterday but got engrossed in trying to get LinuxCNC-rt debs building. Basically 7i96s support in hm2 and pncconf was in 2.9 but not 2.8. Then the chip shortage meant that the 7i96s was just about the only board readily available, so I cherry-picked just enough to support the board from 2.9 to 2.8 for the 2.8.4 release. To solve the conflicts there I believe that the best strategy is to leave the 2.9 version as-is (ie checkout --ours) for hm2 and pncconf. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] pncconf discrepancy between 2.8 and 2.9
On Fri, 2 Dec 2022 at 04:38, Sebastian Kuzminsky wrote: > I'm merging 2.8 into 2.9, and I came across a spot where it looks like a > feature was added independently to both 2.8 and 2.9 (7i96s support in > pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8. I was going to do that merge too, as I am responsible for the somewhat unusual process. In fact I planned it for yesterday but got engrossed in trying to get LinuxCNC-rt debs building. Basically 7i96s support in hm2 and pncconf was in 2.9 but not 2.8. Then the chip shortage meant that the 7i96s was just about the only board readily available, so I cherry-picked just enough to support the board from 2.9 to 2.8 for the 2.8.4 release. To solve the conflicts there I believe that the best strategy is to leave the 2.9 version as-is (ie checkout --ours) for hm2 and pncconf. -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
[Emc-developers] pncconf discrepancy between 2.8 and 2.9
I'm merging 2.8 into 2.9, and I came across a spot where it looks like a feature was added independently to both 2.8 and 2.9 (7i96s support in pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8. Please remember folks: apply patches to the oldest branch where it belongs, then merge up. When you apply a patch to multiple branches independently, and then apply different bugfixes in different branches, the result is chaos and regressions. -- Sebastian Kuzminsky ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
