On 10/30/2015 09:46 PM, Sebastian Kuzminsky wrote: > On 10/30/2015 07:38 PM, John Morris wrote: >> Branch at [1] and buildbot passes. I squashed your unit test commits >> into one and picked that plus my fix off onto 2.6. Take a look and >> merge at your leisure. Thanks! >> >> [1]: >> http://git.linuxcnc.org/gitweb?p=linuxcnc.git;h=refs/heads/zultron/glo-2.6-remap-startline-fix > > Thanks for simplifying the commit with the fix. > > But wait, something else is wrong. The test in 6ae4a34 passes, without > the fix in zultron/glo-2.6-remap-startline-fix. > > The test in 6ae4a34 differs from the test I thought we agreed on > earlier, which i captured in the branch called 2.6-mountaindew (commit > e9e5bccd). > > If i apply the fix in zultron/glo-2.6-remap-startline-fix to the > 2.6-mountaindew branch, it passes.
Embarrassing. That's fixed (with other minor cleanups) in glo/zultron/glo-2.6-remap-startline-fix. The diffs between your fix and mine (plus the 'LinuxCNC 2.6.11' commit in my rebase): git diff glo/2.6-mountaindew glo/zultron/glo-2.6-remap-startline-fix~ And of course the fix: git show glo/zultron/glo-2.6-remap-startline-fix Buildbot is chunking away: http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/3615 Thanks for being so attentive, Seb! John ------------------------------------------------------------------------------ _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
