Back
[01:54:25] <KGB-linuxcnc> 03Chris Morley 05v2.5_branch 305309a 06linuxcnc 10docs/man/man9/classicladder.9 manpages -update pages on classicladder * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=305309a
[01:57:44] <cmorley> is 2.5 merged into 2.6 or 2.6_pre something?
[07:07:39] <cradek> cmorley: yes v2.5_branch merges into 2.6; 2.6 merges into master
[07:08:10] <cradek> cmorley: this is described in the gitworkflows manpage, "merging upwards"
[07:08:41] <cradek> cmorley: you did it right, putting the fix in the oldest applicable branch
[08:48:20] <cmorley> ok thanks
[08:58:32] <KGB-linuxcnc> 03Chris Morley 052.6 f9586ac 06linuxcnc Merge branch 'v2.5_branch' into 2.6 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f9586ac
[08:58:32] <KGB-linuxcnc> 03Chris Morley 052.6 ebaae4d 06linuxcnc 10docs/man/man9/classicladder.9 manpages -update classicladder * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=ebaae4d
[09:10:58] <cradek> 2.6 has hide_gui but 2.5 doesn't?
[09:48:04] <seb_kuzminsky> cradek: yep, that's the case
[09:48:26] <seb_kuzminsky> cmorley split the changes in exactly the right way (thanks!)
[09:48:39] <cradek> yes that means he is our new git master
[09:50:18] <seb_kuzminsky> cmorley: does your commit to 2.5 fix #375? seems like it
[09:57:29] <pcw_home> are there plans (or thoughts) for merging the UBC stuff into master?
[10:01:13] <cradek> I'd really like to have the new-rtos support part of it
[10:02:07] <cradek> I've been concentrating on ja4+cba4, which were pretty nontrivial to combine
[10:02:16] <cradek> but I think both of those are extremely important
[10:02:30] <pcw_home> Thats great to get those merged
[10:02:39] <cradek> attempting to combine new-rtos with those seems like a good next step
[10:03:02] <pcw_home> I look forward to trying them out
[10:03:11] <cradek> try them now
[10:03:31] <pcw_home> Just master now right?
[10:03:31] <cradek> there's even a bugtracker category
[10:04:03] <cradek> the ja4-onto-cba4 branch is on top of master
[10:04:20] <pcw_home> I will try it out sometime today
[10:04:40] <cradek> my hopeful vision is that will be the new master as soon as we're pretty sure it's working right
[10:04:45] <cradek> that would be terrific
[10:05:25] <pcw_home> Its great that Sam is beating on is severely
[10:05:31] <pcw_home> on it
[10:18:18] <pcw_home> I'm happy enough with the hm2_ether over plain old UDP/Preempt-RT that
[10:18:19] <pcw_home> a standard distribution that supported hm2_ether would be nice
[12:04:36] <KGB-linuxcnc> 03Norbert Schechner 05master 222450f 06linuxcnc 10src/emc/usr_intf/gmoccapy/gmoccapy.py 10src/emc/usr_intf/gmoccapy/release_notes.txt gmoccapy_1_1_5_2 - bug in clearing G92 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=222450f
[12:14:36] <skunkworks> this seems like the changes from emc1 -> 2... lots of new cool things..
[12:14:43] <seb_kuzminsky> i wonder if that bugfix belongs in 2.6 too?
[12:14:49] <cradek> oh good grief
[12:15:22] <cradek> I mean: yes, I bet so
[12:15:32] <seb_kuzminsky> heh
[12:16:06] <KGB-linuxcnc> 03Norbert Schechner 052.6 fe8519f 06linuxcnc 10src/emc/usr_intf/gmoccapy/gmoccapy.py 10src/emc/usr_intf/gmoccapy/release_notes.txt gmoccapy_1_1_5_2 - bug in clear G92 Offsets * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=fe8519f
[12:17:32] <cradek> there's our answer
[12:17:44] <cradek> although the commit message is slightly different, the change is the same
[20:09:07] <cmorley> Seb_kuzminsky: yes I close #375