Back
[02:32:48] -linuxcnc-github:#linuxcnc-devel- [13linuxcnc] 15trasz closed pull request #69: Another push of FreeBSD-specific changes. Sorry for the mess. (06master...06master) 02
https://github.com/LinuxCNC/linuxcnc/pull/69
[02:33:07] <trasz> okay.
[02:33:42] <trasz> it looks like every time i use 'git merge' or 'git rebase', i invent another way of screwing things up i'd never suppose to be possible.
[02:34:11] <trasz> make it so that other people's commits are in my pull request? easy!
[05:03:25] <andypugh> trasz: I know the feeling.
[08:53:53] <jepler> trasz: if at this point you think you know which commits haven't been applied upstream at linuxcnc.org, then here's another way to approach it: ...
[08:54:10] <jepler> trasz: create a new branch starting at linuxcnc's master branch (I think that's upstream/master to you)
[08:54:44] <jepler> trasz: then for each commit that we haven't taken yet, find its ref (e.g., in gitk upstream/master..origin/master) and pass it to git cherry-pick, going in order from oldest ref to newest
[08:55:13] <jepler> then when you're done, your new branch will be rid of that whole list of commits that keep coming along for the ride
[08:57:13] <jepler> (you can also delete all the lines that are for commits that are already in upstream/master when doing git rebase -i, but since the vast majority of commits have been taken (I think) and there's a lot of noise in the list-of-commits-since-upstream/master, cherry-picking makes more sense)
[11:02:16] -linuxcnc-github:#linuxcnc-devel- [13linuxcnc] 15trasz opened pull request #84: Another push of FreeBSD-specific changes. (06master...06master) 02
https://github.com/LinuxCNC/linuxcnc/pull/84
[11:21:50] <trasz> jepler: i did something else.
[11:22:15] <trasz> jepler: basically git reset --hard FETCH_HEAD.
[11:22:23] <trasz> jepler: and so... another pull request :-)
[11:25:23] <trasz> jepler: also, a question.
[11:25:30] <trasz> jepler: few of the files have shebangs like this:
[11:25:42] <trasz> #!/bin/bash -
[11:25:52] <trasz> can I just get rid of the '-'?
[12:32:19] <KGB-linuxcnc> 03Sebastian Kuzminsky 05master f115cbd 06linuxcnc 10docs/src/getting-started/updating-linuxcnc.txt docs: fix asciidoc markup in Updating LinuxCNC * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f115cbd
[14:04:35] <KGB-linuxcnc> 03Sebastian Kuzminsky 05master 8e88428 06linuxcnc 10tests/interp/compile/expected interp/compile test: update expected * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=8e88428
[14:04:38] <seb_kuzminsky> jepler: ^^^
[15:19:10] * seb_kuzminsky trying to fix a bug in Task: http://i.imgur.com/vJ1PWkS.gif
[15:32:59] <seb_kuzminsky> jepler: a38665b in 2.6 broke linuxcncrsh-tcp in master :-/
[15:33:26] <seb_kuzminsky> and we didn't notice because the buildbot was down (which i also didnt notice until just now)
[15:37:06] <pcw_home> Hmm this is weird, trying to track down high latency on the 4.6.2-rt5 kernel on my Core Duo, I enabled Ftrace
[15:37:07] <pcw_home> so the function that triggers the latency spike could be discovered with cyclictest -b -f but now the high latency
[15:37:09] <pcw_home> has gone.
[15:40:47] <seb_kuzminsky> heisenbug
[15:42:48] <pcw_home> yeah or just shy
[15:45:11] <pcw_home> wonder if running cyclictest made a difference
[16:03:06] <seb_kuzminsky> hmm, actually it was an earlier commit that broke the linuxcncrsh-tcp test
[16:25:36] <Roguish> hey all. is JA branch going to merge with master?
[16:25:46] <seb_kuzminsky> yep
[16:25:51] <seb_kuzminsky> hopefully this coming week
[16:25:52] <Roguish> ETA?
[16:26:04] <Roguish> outstanding.
[16:33:42] <jepler> trasz: huh I am not familiar with using "-" on the #!-line of a shell script. Shouldn't be needed for bash!
[16:34:06] <seb_kuzminsky> hi jepler
[16:34:33] <seb_kuzminsky> i think my squawking above was a false alarm - linuxcncrsh-tcp passes on the buildbot but fails on my stretch system,
[16:34:39] <seb_kuzminsky> so i think i'm doing something stupid here
[16:34:53] <jepler> seb_kuzminsky: or stretch has done something stupid to you
[16:35:15] <jepler> seb_kuzminsky: uh yeah looks like I failed to commit the updated expected script after that change. :-/ not so smart by me
[16:37:13] <seb_kuzminsky> i'm doubting now my decision to run testing instead of stable
[16:37:18] <jepler> trasz: I wish I remembered my motivation for not using setuid all the time, and using setfsuid non-portably instead. should probably take the freebsd logic and fix whatever breaks on linux.
[16:38:32] <jepler> trasz: anyway I'll look at the rest in detail soon, feel free to ping me if you feel neglected.
[16:38:54] <jepler> seb_kuzminsky: somebody needs to be victim of all that stuff so that we can fix it .. but I hope you didn't do it on a machine that has to do real useful work!
[16:39:06] * seb_kuzminsky coughs
[16:39:27] <jepler> :-/
[16:46:04] <jepler> @@ -1,4 +1,4 @@
[16:46:05] <jepler> -#!/usr/bin/python2.4
[16:46:05] <jepler> +#!/usr/bin/env python2.4
[16:46:11] <jepler> you know I really doubt this works for very many people either way
[16:46:26] <seb_kuzminsky> just for cradek :-P
[16:46:39] <KGB-linuxcnc> 03Jon Elson 052.6 fd5c1dd 06linuxcnc 10configs/by_interface/pico/USC_encod/univstep.ini Explain difference between INPUT_SCALE and OUTPUT_SCALE * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=fd5c1dd
[16:50:52] <jepler> $ halrun
[16:50:52] <jepler> /home/jepler/src/linuxcnc/trasz/scripts/realtime: line 116: syntax error near unexpected token `|'
[16:50:55] <jepler> /home/jepler/src/linuxcnc/trasz/scripts/realtime: line 116: ` if | awk '{print $1}' | grep -x $MOD >/dev/null ; then'
[16:51:16] <seb_kuzminsky> looks like a sedstitution that bellyflopped
[16:51:30] <jepler> yeah I think it has to do with getting rid of the insmod/rmmod/lsmod
[17:17:04] <linuxcnc-build> build #4276 of 0000.checkin is complete: Failure [4failed fetch branch to local git repo] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/4276 blamelist: Jeff Epler <jepler@unpythonic.net>
[19:26:29] <linuxcnc-build> build #428 of 4017.5.deb-wheezy-armhf is complete: Failure [4failed shell_3] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/4017.5.deb-wheezy-armhf/builds/428 blamelist: Jeff Epler <jepler@unpythonic.net>, Jon Elson <elson@pico-systems.com>
[20:11:48] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.6 8a2d85c 06linuxcnc 10src/libnml/cms/tcp_srv.cc linuxcncsrv: ioctl(FIONREAD) wants int*, not ulong* * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=8a2d85c
[20:22:12] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.7 fa42e11 06linuxcnc 10src/libnml/cms/tcp_srv.cc Merge remote-tracking branch 'origin/2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=fa42e11
[20:22:38] <KGB-linuxcnc> 03Sebastian Kuzminsky 05master 928b7f2 06linuxcnc 10src/libnml/cms/tcp_srv.cc Merge remote-tracking branch 'origin/2.7' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=928b7f2
[20:49:05] <jepler> seb_kuzminsky: aha good find
[20:50:53] <KGB-linuxcnc> 05ja13-teleop-after-homing 09f1785 06linuxcnc 04. branch deleted * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=09f1785
[20:55:06] <KGB-linuxcnc> 03Sebastian Kuzminsky 05joints_axes16 619da03 06linuxcnc New branch with 461 commits pushed, 10828 files changed, 0344400(+), 0450863(-) since master/928b7f2
[20:57:34] <seb_kuzminsky> dinner time
[21:07:15] -linuxcnc-github:#linuxcnc-devel- [13linuxcnc] 15SebKuzminsky opened pull request #85: Joints axes16 (06master...06joints_axes16) 02
https://github.com/LinuxCNC/linuxcnc/pull/85
[21:07:18] <seb_kuzminsky> heh, github says "This comparison is big! We’re only showing the most recent 250 commits
[21:07:47] <seb_kuzminsky> let's not have a 460 commit, 95k line feature branch ever again
[21:13:07] <KGB-linuxcnc> 03Jeff Epler 05jepler/master/configure-foomod 6ced8a4 06linuxcnc 10src/configure.in configure: revamp *mod detection * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=6ced8a4
[22:10:40] <KGB-linuxcnc> 03Jeff Epler 05jepler/master/pgrep af3eba3 06linuxcnc 10scripts/linuxcnc.in 10scripts/realtime.in 10src/configure.in configure: use (more) portable pgrep * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=af3eba3
[22:18:26] <jepler> 'night, I'll try to remember to check buildbot results in the morning
