Back
[00:00:36] -!- amiri has quit [Quit: Lost terminal]
[00:00:55] <KGB-linuxcnc> 03John Thornton 052.7 c25552d 06linuxcnc 10docs/src/gui/gmoccapy.txt Docs: fix anchor messed up in merge * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=c25552d
[00:01:41] <jthornton> I also sent Norbert an email about merging from 2.6 to 2.7 and checking links
[00:02:38] -!- __rob has quit [Ping timeout: 260 seconds]
[00:06:01] -!- anth0ny_ has quit [Quit: anth0ny_]
[00:10:03] -!- chris_99 has quit [Quit: Leaving]
[00:11:57] -!- Giac0m0 has quit [Quit: Bye bye]
[00:12:30] <KGB-linuxcnc> 05jepler/dh-buildfix b11936e 06hostmot2-firmware 04. branch deleted * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=b11936e
[00:14:44] <KGB-linuxcnc> 03Jeff Epler 05master 83ae8e5 06hostmot2-firmware Merge branch 'jepler/i24+i25' * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=83ae8e5
[00:15:19] <jepler> .. cncbasher verfied that the i25 firmware worked, and I verified the i24 one. This is the first time we've built a firmware for the cards that implement their own PCI interfaces.
[00:15:23] <jepler> afk
[00:15:30] -!- __rob2 has quit [Ping timeout: 240 seconds]
[00:20:01] <andypugh> Is there a reason to use cat filename | patch rather than patch filename?
[00:21:36] -!- amiri__ has quit [Quit: Lost terminal]
[00:21:37] -!- amiri_ has quit [Quit: Lost terminal]
[00:21:37] -!- amiri____ has quit [Client Quit]
[00:21:37] -!- amiri has quit [Quit: Lost terminal]
[00:21:37] -!- amiri___ has quit [Client Quit]
[00:22:33] -!- gonzo_nb has quit [Remote host closed the connection]
[00:23:48] <jepler> andypugh: The equivalent without "cat" would be: patch < filename
[00:24:22] <jepler> if you are using a patch generated by git format-patch, then the ideal way to apply it is with git am ("apply mailbox"), because that will keep information about the patch author that is shown at the top of the patch
[00:24:46] <jepler> but if you have a patch from anything but git format-patch then git am is not useful
[00:25:34] <andypugh> This is someone’s rt-preempt patching instructions
[00:25:44] <jepler> the command "patch filename" will still expect to have a patch on its standard input, but the file patched will be "filename". This is because one very old type of patch, the "ed style", does not even specify the expected file name.
[00:26:20] <jepler> OK, cat filename | patch OR patch < filename should be equivalent
[00:26:21] <andypugh> That’s not what the patch manpage says
[00:26:48] <andypugh> The manpage says that it applies the patch in filename to whatever it can find that seems to fit.
[00:27:14] <jepler> my patch manpage says this tersely under synopsis:
[00:27:14] <jepler> patch [options] [originalfile [patchfile]]
[00:27:31] <jepler> which I interpret as saying that the first non-option commandline argument is taken to be the file to patch
[00:27:44] <jepler> >> if there's just one file to be
[00:27:44] <jepler> patched it can be specified on the command line as originalfile.
[00:28:33] <andypugh> Sorry, yes, I just spotted the < in the anpage
[00:29:50] <jepler> OK
[00:30:12] <jepler> ah yes here it's typeset without a space after it, making it easier to overlook
[00:30:24] <andypugh> When I have used it i have used <. I am trying to work out if there is a reason to use cat and pipe
[00:30:53] <jepler> almost certainly not
[00:31:12] <jepler> http://www.greenend.org.uk/rjk/tech/shellmistakes.html#redundantcat
[00:31:54] <jepler> though I think that using the '< patchfile patch' syntax cannot really be recommended, it reads weird even to this experienced shell scripter
[00:32:00] <jepler> which isn't to say I've never done it myself
[00:32:18] <jepler> anyway this is the key: > Very occasionally it does make sense to put in the "cat": if the process that reads the input behaves differently depending on whether it is a regular file, a pipe, a terminal, etc, then it might be that turning it into a pipe via the "cat" command makes sense.
[00:32:26] <jepler> but patch is not such a program
[00:33:12] <jepler> new forum signup: E-mail - spammanofdoom@example.com
[00:33:25] <jepler> sounds legit
[00:33:55] <skunkworks> ship it
[00:34:55] <andypugh> jepler: I saw that, but the name looks legit.
[00:35:05] <andypugh> And he hasn’t spammed us yet.
[00:35:07] <jepler> andypugh: ah you see those too
[00:35:16] <andypugh> Yeah.
[00:35:19] <jepler> I have no idea who receives some of these e-mails besides me
[00:35:40] <andypugh> Sadly the thing that really sets of my spammer-radar is any girls name :-(
[00:35:44] <jepler> wellll
[00:35:56] <jepler> I wouldn't preemptively delete an account just because of that
[00:36:06] <jepler> I hear there's at least one woman in the community
[00:37:31] <andypugh> There are several. Well, maybe not enough to be several.
[00:39:30] -!- rob_h has quit [Ping timeout: 260 seconds]
[00:44:22] -!- KimK [KimK!~Kim__@ip68-102-29-211.ks.ok.cox.net] has joined #linuxcnc-devel
[00:47:39] -!- bkboggy has quit [Quit: For Narnia!]
[00:59:47] <seb_kuzminsky> this fluidic oscillator is neat:
http://fuckyeahfluiddynamics.tumblr.com/post/134062218596/a-fluidic-oscillator-is-a-device-with-no-moving
[01:04:16] -!- andypugh has quit [Quit: andypugh]
[01:08:38] -!- KimK has quit [Ping timeout: 246 seconds]
[01:11:07] -!- KimK [KimK!~Kim__@ip68-102-29-211.ks.ok.cox.net] has joined #linuxcnc-devel
[01:18:47] <jepler> seb_kuzminsky: yeah I saw that the other day too
[01:18:50] -!- Loetmichel has quit [Ping timeout: 240 seconds]
[01:19:12] <jepler> I wondered if you could design one with more than two directions, once you are working in 3d instead of 2...
[01:19:16] <jepler> seems like you could
[01:27:24] <seb_kuzminsky> i want to push my new rtai debs to wlo, any objections? so people can test them out
[01:27:42] <seb_kuzminsky> any objections?
[01:31:36] -!- andypugh [andypugh!~andypugh@cpc14-basl11-2-0-cust1010.20-1.cable.virginm.net] has joined #linuxcnc-devel
[01:34:43] <jepler> seb_kuzminsky: not from me
[01:34:53] -!- KimK has quit [Ping timeout: 246 seconds]
[01:35:42] -!- liedman has quit [*.net *.split]
[01:46:43] -!- KimK [KimK!~Kim__@ip68-102-29-211.ks.ok.cox.net] has joined #linuxcnc-devel
[01:53:16] -!- KimK has quit [Quit: Ex-Chat]
[01:54:06] -!- Sairon has quit [Ping timeout: 240 seconds]
[01:57:18] <skunkworks> seb_kuzminsky: not from me :)
[01:59:49] -!- RagingComputer has quit [Ping timeout: 244 seconds]
[02:00:20] -!- raymondhim has quit [Ping timeout: 244 seconds]
[02:01:16] -!- KimK [KimK!~Kim__@ip68-102-29-211.ks.ok.cox.net] has joined #linuxcnc-devel
[02:08:12] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates 2662f58 06linuxcnc 10tcl/bin/halshow.tcl halshow: tree insert at end to preserve sort * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=2662f58
[02:08:13] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates 11f460f 06linuxcnc 10(13 files in 7 dirs) locking indexer:joint homing with gcode locking * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=11f460f
[02:08:13] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates 259c869 06linuxcnc 10(7 files in 5 dirs) ini-config.txt updates for joints_axes * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=259c869
[02:08:14] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates fff0ec6 06linuxcnc 10(99 files in 41 dirs) sim/configs: cleanup HOME items (joints_axes) * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=fff0ec6
[02:08:18] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates f7e0d49 06linuxcnc 10src/emc/usr_intf/gmoccapy/gmoccapy.py 10src/emc/usr_intf/gscreen/emc_interface.py 10src/emc/usr_intf/touchy/emc_interface.py force jogmode for touchy,gscreen,gmoccapy (JA) * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f7e0d49
[02:12:41] <linuxcnc-build> build #1548 of 4017.deb-wheezy-amd64 is complete: Failure [4failed shell_3] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/4017.deb-wheezy-amd64/builds/1548 blamelist: John Thornton <jt@gnipsel.com>
[02:12:50] -!- KimK has quit [Ping timeout: 260 seconds]
[02:17:19] <linuxcnc-build> build #1239 of 4018.deb-wheezy-rtai-i386 is complete: Failure [4failed shell_3] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/4018.deb-wheezy-rtai-i386/builds/1239 blamelist: John Thornton <jt@gnipsel.com>
[02:19:07] -!- justanotheruser has quit [Quit: Reconnecting]
[02:23:49] <linuxcnc-build> build #1546 of 4016.deb-wheezy-i386 is complete: Failure [4failed shell_3] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/4016.deb-wheezy-i386/builds/1546 blamelist: John Thornton <jt@gnipsel.com>
[02:28:18] <linuxcnc-build> build #3690 of 1300.rip-precise-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1300.rip-precise-i386/builds/3690 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:28:35] <linuxcnc-build> build #3692 of 1306.rip-precise-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1306.rip-precise-amd64/builds/3692 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:29:49] <linuxcnc-build> build #3691 of 1200.rip-lucid-i386 is complete: Failure [4failed compile runtests] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1200.rip-lucid-i386/builds/3691 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:30:57] <jepler> jt's build error is odd
[02:30:58] <jepler> Unpacking texlive-base (from .../texlive-base_2012.20120611-5_all.deb) ...
[02:31:02] <jepler> command timed out: 1200 seconds without output, attempting to kill
[02:32:02] <jepler> dewey's shouldn't be tough to resolve .. make: *** [checkref_en] Error 1
[02:33:29] <seb_kuzminsky> guh
[02:33:38] <linuxcnc-build> build #1851 of 1403.rip-wheezy-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1403.rip-wheezy-amd64/builds/1851 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:34:02] <jepler> seb_kuzminsky: not sure how implementable this is, but ...
[02:34:17] <linuxcnc-build> build #2900 of 1301.rip-precise-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1301.rip-precise-rtai-i386/builds/2900 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:34:29] <jepler> seb_kuzminsky: currently IIUC you build on a wheezy-vanilla and wheezy-preempt-rt (and ditto for jessie?) while the code is essentially the same
[02:34:44] <jepler> if you run the tests once *BEFORE* make setuid you exercise the vanilla code paths
[02:34:54] <jepler> and if you run them again *AFTER* you exercise the rt code paths
[02:35:07] <jepler> does that make sense, even if it's not a peg that fits in any of your available holes?
[02:35:25] <seb_kuzminsky> the only timeout was on precise-rtai-i386, right? that one crashed, as it does sometimes, and i rebooted it
[02:35:26] -!- erve has quit [Ping timeout: 246 seconds]
[02:35:38] <jepler> that message was from
http://buildbot.linuxcnc.org/buildbot/builders/4017.deb-wheezy-amd64/builds/1548 I think
[02:35:49] <seb_kuzminsky> oh, hm
[02:35:52] <jepler> anyway, just an idea which might reduce the number of buildslaves you had to run...
[02:35:53] <linuxcnc-build> build #1883 of 1405.rip-wheezy-armhf is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1405.rip-wheezy-armhf/builds/1883 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:36:29] <jepler> but as running the tests is a long phase of the build as a whole, it might hurt real time until a check's build is done, hm
[02:36:46] <seb_kuzminsky> hmm, yeah
[02:36:54] <seb_kuzminsky> i guess i'd rather run more slaves, to get more parallelism
[02:37:01] <seb_kuzminsky> bbl
[02:39:12] <linuxcnc-build> build #1516 of 1401.rip-wheezy-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1401.rip-wheezy-rtai-i386/builds/1516 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:39:53] <linuxcnc-build> build #1850 of 1400.rip-wheezy-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1400.rip-wheezy-i386/builds/1850 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:45:56] -!- kalxas has quit [Quit: Goodbye]
[02:46:48] Loetmichel2 is now known as Loetmichel
[02:53:18] -!- valeech has quit [Quit: valeech]
[02:57:35] <linuxcnc-build> build #3691 of 1202.rip-lucid-amd64 is complete: Failure [4failed compile runtests] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1202.rip-lucid-amd64/builds/3691 blamelist: Dewey Garrett <dgarrett@panix.com>
[02:59:20] -!- Akex_ has quit [Quit: Connection closed for inactivity]
[02:59:20] -!- anth0ny_ has quit [Quit: anth0ny_]
[03:10:52] <linuxcnc-build> build #3694 of 1201.rip-lucid-rtai-i386 is complete: Failure [4failed compile runtests] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1201.rip-lucid-rtai-i386/builds/3694 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:15:57] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates 95ef5f4 06linuxcnc 10src/emc/rs274ngc/interp_convert.cc interp_convert.c:fix logic detecting rotaryindexer * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=95ef5f4
[03:25:57] -!- andypugh has quit [Quit: andypugh]
[03:31:15] -!- justanotheruser has quit [Ping timeout: 260 seconds]
[03:33:19] <linuxcnc-build> build #2042 of 1404.rip-wheezy-rtpreempt-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1404.rip-wheezy-rtpreempt-amd64/builds/2042 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:34:11] -!- yasnak has quit [Quit: Leaving]
[03:34:38] <linuxcnc-build> build #1361 of 1402.rip-wheezy-rtpreempt-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1402.rip-wheezy-rtpreempt-i386/builds/1361 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:39:10] -!- Sairon has quit [Ping timeout: 260 seconds]
[03:40:16] -!- anth0ny_ has quit [Quit: anth0ny_]
[03:43:16] -!- anth0ny_ has quit [Client Quit]
[03:45:32] <linuxcnc-build> build #318 of 1502.rip-jessie-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1502.rip-jessie-amd64/builds/318 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:50:21] <linuxcnc-build> build #318 of 1500.rip-jessie-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1500.rip-jessie-i386/builds/318 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:50:34] <linuxcnc-build> build #318 of 1501.rip-jessie-rtpreempt-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1501.rip-jessie-rtpreempt-i386/builds/318 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:50:36] <linuxcnc-build> build #318 of 1503.rip-jessie-rtpreempt-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1503.rip-jessie-rtpreempt-amd64/builds/318 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:50:36] <linuxcnc-build> build #3704 of 0000.checkin is complete: Failure [4failed] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/3704 blamelist: Dewey Garrett <dgarrett@panix.com>
[03:54:34] -!- nofxx has quit [Ping timeout: 260 seconds]
[03:56:38] -!- SpeedEvil has quit [Ping timeout: 246 seconds]
[04:04:31] <linuxcnc-build> build #3691 of 1300.rip-precise-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1300.rip-precise-i386/builds/3691 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:04:42] <linuxcnc-build> build #3693 of 1306.rip-precise-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1306.rip-precise-amd64/builds/3693 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:07:08] <linuxcnc-build> build #2901 of 1301.rip-precise-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1301.rip-precise-rtai-i386/builds/2901 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:07:36] <linuxcnc-build> build #1852 of 1403.rip-wheezy-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1403.rip-wheezy-amd64/builds/1852 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:07:37] <linuxcnc-build> build #1851 of 1400.rip-wheezy-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1400.rip-wheezy-i386/builds/1851 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:08:09] <linuxcnc-build> build #2043 of 1404.rip-wheezy-rtpreempt-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1404.rip-wheezy-rtpreempt-amd64/builds/2043 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:08:10] <linuxcnc-build> build #1362 of 1402.rip-wheezy-rtpreempt-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1402.rip-wheezy-rtpreempt-i386/builds/1362 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:08:56] <linuxcnc-build> build #1517 of 1401.rip-wheezy-rtai-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1401.rip-wheezy-rtai-i386/builds/1517 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:09:10] <linuxcnc-build> build #319 of 1500.rip-jessie-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1500.rip-jessie-i386/builds/319 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:09:10] <linuxcnc-build> build #319 of 1502.rip-jessie-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1502.rip-jessie-amd64/builds/319 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:09:18] <linuxcnc-build> build #319 of 1501.rip-jessie-rtpreempt-i386 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1501.rip-jessie-rtpreempt-i386/builds/319 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:09:24] <linuxcnc-build> build #319 of 1503.rip-jessie-rtpreempt-amd64 is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1503.rip-jessie-rtpreempt-amd64/builds/319 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:17:01] <linuxcnc-build> build #1884 of 1405.rip-wheezy-armhf is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/1405.rip-wheezy-armhf/builds/1884 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:25:29] <linuxcnc-build> build #3705 of 0000.checkin is complete: Failure [4failed] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/3705 blamelist: Dewey Garrett <dgarrett@panix.com>
[04:31:23] -!- Nutter has quit [Ping timeout: 264 seconds]
[04:44:09] -!- KimK_laptop has quit [Remote host closed the connection]
[04:55:47] -!- automata_ has quit [Ping timeout: 246 seconds]
[04:59:46] -!- AR_ has quit [Ping timeout: 240 seconds]
[05:21:37] -!- liedman has quit [*.net *.split]
[05:24:02] -!- OhmEye has quit [*.net *.split]
[05:25:19] OhmEye is now known as Guest29368
[05:55:47] -!- PetefromTn_ has quit [Quit: I'm Outta here!!]
[05:58:32] -!- SEL [SEL!~SEL@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[05:59:12] -!- SEL has quit [Client Quit]
[06:03:53] <KGB-linuxcnc> 03Sebastian Kuzminsky 05master 5a6d243 06linuxcnc 10docs/src/gui/gmoccapy.txt Merge remote-tracking branch 'origin/2.7' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=5a6d243
[06:05:21] -!- automata_ has quit [Quit: Leaving]
[06:09:06] -!- sumpfralle has quit [Ping timeout: 240 seconds]
[06:16:34] Guest29368 is now known as OhmEye
[06:22:59] -!- erve has quit [Remote host closed the connection]
[06:30:17] -!- anomynous_ has quit [Ping timeout: 246 seconds]
[06:42:17] -!- ve7it has quit [Remote host closed the connection]
[06:45:21] -!- Einherjer has quit [Read error: Connection reset by peer]
[06:45:22] -!- Tristitia has quit [Read error: Connection reset by peer]
[06:49:38] -!- Einherjer [Einherjer!~einherjer@69.64.40.177] has joined #linuxcnc-devel
[07:21:26] micges_ is now known as micges
[07:21:40] -!- jerryitt has quit [Quit: Connection closed for inactivity]
[07:27:54] -!- SEL [SEL!~SEL@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[07:28:18] -!- SEL has quit [Client Quit]
[07:37:29] -!- SEL [SEL!~SEL@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[08:09:28] -!- kwallace [kwallace!~kwallace@216.86.190.169] has parted #linuxcnc-devel
[08:12:48] -!- LikeVinyl has quit [Ping timeout: 264 seconds]
[08:12:49] -!- membiblio has quit [Ping timeout: 264 seconds]
[08:15:08] -!- liedman has quit [*.net *.split]
[08:22:04] -!- Tecan has quit [Changing host]
[08:32:43] -!- mozmck has quit [Read error: Connection reset by peer]
[08:34:51] -!- mozmck [mozmck!~moses@67.210.159.245] has joined #linuxcnc-devel
[08:52:52] -!- Tecan has quit [Quit: Live Long And Phosphor!]
[08:54:50] -!- capricorn_1 has quit [Ping timeout: 246 seconds]
[09:04:04] -!- SEL has quit [Quit: Leaving]
[09:12:18] -!- JesusAlos has quit [Quit: JesusAlos]
[09:34:21] -!- rob_h [rob_h!~robh@94.11.18.120] has joined #linuxcnc-devel
[09:37:20] -!- bkboggy has quit [Quit: For Narnia!]
[09:49:51] -!- mk0 [mk0!~mk0@37.17.18.112] has joined #linuxcnc-devel
[10:10:57] -!- micges_ [micges_!~micges@afc81.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[10:12:42] -!- anth0ny_ has quit [Quit: anth0ny_]
[10:14:06] -!- micges has quit [Ping timeout: 240 seconds]
[10:16:09] micges_ is now known as micges
[10:17:10] -!- mk0 has quit [Quit: Leaving]
[10:22:34] -!- mk0 [mk0!~mk0@37.17.7.141] has joined #linuxcnc-devel
[10:22:37] -!- justanotheruser has quit [Quit: leaving]
[10:27:10] -!- kalxas has quit [Changing host]
[10:54:35] -!- Stoneanvil has quit [Read error: Connection reset by peer]
[10:54:37] -!- Stoneanv_ [Stoneanv_!~stoneanvi@CPEbc4dfbc8cb83-CMbc4dfbc8cb80.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
[11:21:39] -!- io has quit [Quit: Ex-Chat]
[11:34:14] -!- tobias47n9e has quit [Ping timeout: 260 seconds]
[12:07:18] -!- JesusAlos has quit [Quit: JesusAlos]
[12:11:51] -!- JesusAlos has quit [Client Quit]
[12:17:14] Sairon is now known as norias
[12:18:17] -!- mrsun__ has quit [Ping timeout: 272 seconds]
[12:28:21] -!- JesusAlos has quit [Quit: JesusAlos]
[12:39:00] -!- yasnak has quit [Read error: Connection reset by peer]
[12:48:12] -!- b_b has quit [Changing host]
[12:56:36] -!- JesusAlos has quit [Quit: JesusAlos]
[13:24:30] -!- norias has quit [Quit: Leaving]
[13:31:13] -!- SpeedEvil has quit [Quit: No Ping reply in 180 seconds.]
[13:33:14] <jthornton> just wondering out loud what is the future for things like gladevcp when glade 3.8 is the last version you can use? I did install glade-gtk2 on mint so I good for now.
[13:46:18] -!- Deejay has quit [Ping timeout: 260 seconds]
[13:50:36] -!- chris_99 has quit [Quit: Leaving]
[13:55:39] -!- kriskropd has quit [Ping timeout: 260 seconds]
[14:02:58] <KGB-linuxcnc> 03John Thornton 052.7 3e4edce 06linuxcnc 10docs/src/gui/gladevcp.txt Docs: update install instructions for glade * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=3e4edce
[14:06:22] -!- ibaca has quit [Ping timeout: 260 seconds]
[14:07:47] -!- almostworking has quit [Ping timeout: 260 seconds]
[14:07:47] -!- logger[mah] has quit [Ping timeout: 260 seconds]
[14:07:50] -!- CaptHindsight has quit [Ping timeout: 240 seconds]
[14:08:18] -!- CaptHindsight [CaptHindsight!~2020@unaffiliated/capthindsight] has joined #linuxcnc-devel
[14:09:52] -!- SEL [SEL!~SEL@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[14:13:53] -!- logger[mah] [logger[mah]!~loggermah@mah2.mah.priv.at] has joined #linuxcnc-devel
[14:15:49] -!- SEL has quit [Quit: Leaving]
[14:19:26] <KGB-linuxcnc> 03Dewey Garrett 05dgarr/ja9_updates 59ea045 06linuxcnc 10docs/src/config/core-components.txt config/core-components.txt missing link * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=59ea045
[14:21:09] <jepler> jthornton: that's concerning, but I'm not a gladevcp developer and I know too little about glade and gtk to help...
[14:31:30] -!- tsingi has quit [Ping timeout: 240 seconds]
[14:54:14] <mozmck> one problem with gtk3 is that they keep making breaking api changes between releases
[14:54:52] <JT-Shop> yea, I found gtk3 to be real buggy
[14:55:47] -!- Roguish_ [Roguish_!~chatzilla@c-50-143-183-159.hsd1.ca.comcast.net] has joined #linuxcnc-devel
[14:57:10] -!- Roguish has quit [Ping timeout: 240 seconds]
[14:57:12] Roguish_ is now known as Roguish
[15:01:03] -!- tinkerer [tinkerer!~tinkerer@mail.play-pla.net] has joined #linuxcnc-devel
[15:09:52] -!- kwallace [kwallace!~kwallace@216.86.190.169] has joined #linuxcnc-devel
[15:54:33] -!- c_morley has quit [Quit: Leaving.]
[15:54:52] -!- c_morley [c_morley!~chris@24.244.23.141] has joined #linuxcnc-devel
[16:13:08] -!- mk0 has quit [Quit: Leaving]
[16:22:12] -!- SEL [SEL!~SEL@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[16:22:35] -!- SEL has quit [Client Quit]
[16:27:38] -!- __rob has quit [Read error: Connection reset by peer]
[16:37:46] <skunkworks> he is back
https://groups.yahoo.com/neo/groups/mach1mach2cnc/conversations/messages/149558
[16:40:52] -!- capricorn_1 has quit [Client Quit]
[16:49:16] -!- jthornton- [jthornton-!~john@172.243.160.48] has joined #linuxcnc-devel
[16:49:17] -!- jthornton has quit [Read error: Connection reset by peer]
[16:52:10] -!- Contract_Pilot has quit [Ping timeout: 240 seconds]
[16:53:25] -!- zeeshan|2 [zeeshan|2!~kvirc64@CPE0018e7cea342-CM5039555db2cc.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
[16:54:35] -!- jthornton- has quit [Read error: Connection reset by peer]
[16:54:51] -!- JT-Shop has quit [Read error: Connection reset by peer]
[16:55:08] -!- JT-Shop [JT-Shop!~JT@172.243.160.48] has joined #linuxcnc-devel
[16:56:04] -!- jthornton [jthornton!~john@172.243.160.48] has joined #linuxcnc-devel
[16:56:30] -!- WZL has quit [Ping timeout: 240 seconds]
[16:56:42] -!- zeeshan has quit [Ping timeout: 260 seconds]
[17:03:22] <KGB-linuxcnc> 03Jeff Epler 05jepler/fuse e3dfb2d 06hostmot2-firmware 10build.py 03iselib.py iselib: factor out some stuff from build.py * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=e3dfb2d
[17:03:22] <KGB-linuxcnc> 03Jeff Epler 05jepler/fuse 8c9e6a1 06hostmot2-firmware 10(6 files in 2 dirs) pin/xml generation: don't require ghdl * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=8c9e6a1
[17:03:54] -!- anth0ny_ has quit [Quit: anth0ny_]
[17:05:21] -!- PetefromTn_ [PetefromTn_!~IceChat9@75-136-59-160.dhcp.jcsn.tn.charter.com] has joined #linuxcnc-devel
[17:06:02] -!- redlegion has quit [Ping timeout: 260 seconds]
[17:09:54] -!- erve has quit [Remote host closed the connection]
[17:13:01] -!- JesusAlos has quit [Quit: JesusAlos]
[17:20:30] <seb_kuzminsky> hm, even with that udevadm fix i sometimes get this error: RTAPI: ERROR: could not open shared memory (Permission denied)
[17:20:46] <seb_kuzminsky> it only seems to happen the first time i run a realtime test after booting the system
[17:21:20] <seb_kuzminsky> maybe udevadm doesn't know that it's "unsettled" yet?
[17:21:33] -!- PetefromTn_ [PetefromTn_!~IceChat9@75-136-59-160.dhcp.jcsn.tn.charter.com] has parted #linuxcnc-devel
[17:22:17] -!- erve has quit [Ping timeout: 272 seconds]
[17:26:13] <jepler> you have a race condition in the code intended to fix your race condition?
[17:29:19] <seb_kuzminsky> sure seems like it
[17:30:09] <seb_kuzminsky> the old CheckLoaded code (had it worked) had the nice quality that it directly tested the thing that had to work later
[17:30:28] <seb_kuzminsky> the new code asks the subsytems responsible for making that thing work if it's done its job yet, which is not as good
[17:36:28] <jepler> > I know that you're not supposed to rely on 'udevadm settle' anymore... [5 years ago]
http://linux-hotplug.vger.kernel.narkive.com/OyVWVYQk/udevadm-settle-persistently-failing
[17:36:46] <jepler> > I can be certain that as of somewhere between udev 164 and 167, 'udevadm
[17:36:49] <jepler> settle' has stopped waiting for block devices to appear (though I
[17:36:52] <jepler> suspect others have vanished too). I'm booting udev as recommended in
[17:36:54] <jepler> the release notes, via
[17:37:32] <jepler> ...
[17:40:37] <KGB-wlo> push to master branch:
http://linuxcnc.org/
[17:41:25] <seb_kuzminsky> wow, the front page updated!
[17:41:28] <seb_kuzminsky> neat!
[17:43:09] <seb_kuzminsky> jepler: well crap, then my fix is wrong
[17:43:39] <jepler> seb_kuzminsky: how does the file .htaccess get put in place on wlo?
[17:43:45] <jepler> is it from jekyll or by hand?
[17:45:50] <seb_kuzminsky> jepler: i think it's a leftover from before the joomla->jekyll switch
[17:45:56] <seb_kuzminsky> jekyll leaves it alone
[17:45:58] <jepler> seb_kuzminsky: ok
[17:46:08] <jepler> is there a reason not to make jekyll manage it?
[17:46:22] <jepler> I *cough* thought I had done that, but pushed it to jepler/wlo and not seb/wlo
[17:46:26] <seb_kuzminsky> no, i think it would make sense to have it in git
[17:46:28] <seb_kuzminsky> heh
[17:48:45] <seb_kuzminsky> bbl
[17:48:57] <KGB-wlo> push to master branch:
http://linuxcnc.org/
[17:53:07] <KGB-linuxcnc> 03pcw 05upstream 900268f 06hostmot2-firmware 10(309 files) Hostmot2 vhdl source 7/25/14 * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=900268f
[17:53:07] <KGB-linuxcnc> 03Jeff Epler 05master 456f553 06hostmot2-firmware Merge branch 'upstream' * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=456f553
[17:54:50] <jepler> pcw had pushed some hostmot2 updates to master branch way back on 7/25/14. I cherry picked that back to the "upstream" branch today, to fit with my ideas about how to get vhd file updates from mesa as an upstream.
[18:01:08] <Roguish> jepler: hey, the link on the new page you just updated points to the i386 jessie. will your new rtai-5 work with amd64 as well as i386? probably not, huh?
[18:02:04] <jepler> Roguish: that was seb's doing. I suspect he built just an i386 kernel but I don't know for certain.
[18:02:38] <Roguish> ok. no problem. i'll give it a whirl. writing the install cd now.
[18:02:59] <Roguish> i mean i will stick with the i386 and do an install.
[18:03:06] <Tom_itx> JT-Shop, could you add line numbers to the code examples in 37.7 here so they go along with the visual image examples:
http://linuxcnc.org/docs/html/gcode/g-code.html#_why_use_a_canned_cycle
[18:03:22] <Tom_itx> someone in linuxcnc brought it to our attention
[18:03:47] <Tom_itx> "Eight holes" and "Twelve holes in a square"
[18:06:00] <jepler> # renamed: irqlogic.vhd -> qcounterateskd.vhd
[18:06:15] <jepler> # renamed: simplespi8.vhd -> ubrategend.vhd
[18:06:21] <jepler> I really doubt git's rename detection in this case!
[18:07:19] <hm2-buildmaster> build #44 of build is complete: Failure [4failed compile] Build details are at
http://buildbot.linuxcnc.org/hm2-buildbot/builders/build/builds/44 blamelist: Jeff Epler <jepler@unpythonic.net>, pcw <pcw@pcw-G41M-Combo.(none)>
[18:07:20] <hm2-buildmaster> build #45 of build is complete: Failure [4failed configure-debian-package update-debian-changelog compile] Build details are at
http://buildbot.linuxcnc.org/hm2-buildbot/builders/build/builds/45 blamelist: pcw <pcw@pcw-G41M-Combo.(none)>
[18:09:48] <jepler> uh oh
[18:10:15] -!- b_b has quit [Remote host closed the connection]
[18:20:57] <KGB-linuxcnc> 03Jeff Epler 05master dbde22d 06hostmot2-firmware 10TopEPPHostMot2.vhd 10TopSerial16HostMot2.vhd fix spurious change brought in after earlier merge * 14http://git.linuxcnc.org/?p=hostmot2-firmware.git;a=commitdiff;h=dbde22d
[18:22:24] -!- JesusAlos has quit [Quit: JesusAlos]
[18:33:33] -!- kalxas has quit [Quit: Goodbye]
[18:35:54] <skunkworks> http://electronicsam.com/images/house/12239195_1658925584386213_1758277926814450245_o.jpg
[18:36:25] -!- maxcnc has quit [Quit: ChatZilla 0.9.92 [Firefox 41.0.2/20151015172900]]
[18:37:40] -!- dnaleromj [dnaleromj!~dnaleromj@172-125-49-79.lightspeed.chtnsc.sbcglobal.net] has joined #linuxcnc-devel
[18:38:56] -!- duc has quit [Quit: Bye]
[18:51:13] -!- dnaleromj has quit [Quit: Dang. Where did dnaleromj's computer go?]
[18:56:15] -!- dnaleromj [dnaleromj!~dnaleromj@172-125-49-79.lightspeed.chtnsc.sbcglobal.net] has joined #linuxcnc-devel
[18:57:59] <JT-Shop> Tom_itx: I see what you mean
[18:59:20] <JT-Shop> lost them in 2.3
http://linuxcnc.org/docs/2.2/html/gcode_mill_canned.html#r1_13
[19:17:46] <KGB-wlo> push to master branch:
http://linuxcnc.org/
[19:23:46] -!- zeeshan|2 has quit [Quit: KVIrc 4.3.1 Aria http://www.kvirc.net/ - 64bit Windows version by http://kvirc.d00p.de/]
[19:24:03] -!- zeeshan|2 [zeeshan|2!~kvirc64@CPE0018e7cea342-CM5039555db2cc.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
[19:47:35] -!- Contract_Pilot has quit [Ping timeout: 246 seconds]
[19:50:15] <JT-Shop> I think there is a problem with the activation on the forum. 120+ not activated since 2015-11-08, one guy has used 3 different email addresses and never got the conformation
[20:00:48] -!- asdfasd has quit [*.net *.split]
[20:00:48] -!- bluemaex has quit [*.net *.split]
[20:00:48] -!- liedman has quit [*.net *.split]
[20:02:24] -!- JesusAlos has quit [Quit: JesusAlos]
[20:06:13] -!- JesusAlos has quit [Client Quit]
[20:06:35] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.7 998dcf5 06linuxcnc 10VERSION 10debian/changelog LinuxCNC 2.7.3 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=998dcf5
[20:06:35] <KGB-linuxcnc> 03Sebastian Kuzminsky 05signed tags 7ec59a9 06linuxcnc 03v2.7.3 LinuxCNC v2.7.3 (tagged commit: 998dcf5) * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=7ec59a9
[20:06:57] <jepler> JT-Shop: I just completed a new signup without trouble, using @gmail.com. for whatever that's worth.
[20:08:00] -!- JesusAlos has quit [Client Quit]
[20:08:07] <jepler> the world sucks and lots of broken e-mail providers deny too much e-mail trying to stop spam from getting through. generally there's nothing that can be done about it on the sending side.
[20:10:33] <JT-Shop> I can't help to wonder why there are only 2 from pre-change and now 120 in a couple of weeks. The one guy did say he tried 3 different mail providers...
[20:11:24] <JT-Shop> I'm trying to recall what I had a problem with like not filling out a blank or something and it failed once for me... I'll try and reproduce it when I get a break
[20:12:11] <jepler> were any of them gmail?
[20:12:39] <JT-Shop> I don't recall what email I used
[20:12:49] <jepler> no, this one guy you keep mentioning
[20:13:25] <JT-Shop> a yahoo, comcast and outlook account
[20:13:44] <jepler> if you correspond with this user again, recommend to use gmail
[20:14:11] <JT-Shop> I found his username and activated it for him
[20:14:26] <jepler> thank you
[20:15:53] <JT-Shop> looking at the emails used on unactivated accounts are mail.ru, outlook.com, gmail.com, yandex.com
[20:15:57] <JT-Shop> lots of mail.ru
[20:17:24] <JT-Shop> sbcglobal.net, hotmail.com, unpythonic.net, aol.com
[20:17:58] <JT-Shop> gotta get back to work
[20:18:43] <jepler> unpythonic.net is me
[20:18:51] <jepler> probably some testing account
[20:19:49] <jepler> I just tested with my wife's gmail address, it gets through fine. I really think gmail is delivering the signups.
[20:20:00] <jepler> I know that some mail providers aren't but we can't do anything about it.
[20:20:18] <JT-Shop> ok, thanks for checking
[20:26:44] <jepler> (if someone in the peanut gallery has a specific technical suggestion about what to do about non-delivered sign up e-mails I'm all ears)
[20:27:53] -!- Duc has quit [Ping timeout: 276 seconds]
[20:35:16] -!- dnaleromj has quit [Quit: Textual IRC Client: www.textualapp.com]
[20:42:11] -!- Duc has quit [Ping timeout: 264 seconds]
[20:42:49] -!- C_P-Away has quit [Ping timeout: 264 seconds]
[20:56:58] <JT-Shop> jepler do you want me to delete your test registrations while I'm looking?
[21:05:12] <JT-Shop> https://weeblr.com/blog/resend-joomla-activation-email-with-wbreactiv
[21:07:22] -!- duc has quit [Quit: Bye]
[21:11:11] -!- zeeshan|2 has quit [*.net *.split]
[21:11:15] -!- erve has quit [*.net *.split]
[21:11:15] -!- Camaban has quit [*.net *.split]
[21:11:15] -!- redlegion has quit [*.net *.split]
[21:11:16] -!- chris_99 has quit [*.net *.split]
[21:11:16] -!- OhmEye has quit [*.net *.split]
[21:11:19] -!- A_Nub has quit [*.net *.split]
[21:11:20] -!- dagjomar has quit [*.net *.split]
[21:11:20] -!- skunkworks has quit [*.net *.split]
[21:11:21] -!- Jeebiss has quit [*.net *.split]
[21:11:22] -!- AphelionZ has quit [*.net *.split]
[21:11:22] -!- enleth has quit [*.net *.split]
[21:11:25] -!- Patang has quit [*.net *.split]
[21:11:25] -!- Fox_Muldr has quit [*.net *.split]
[21:11:32] -!- TekniQue has quit [*.net *.split]
[21:11:33] -!- ink has quit [*.net *.split]
[21:11:34] -!- GJdan has quit [*.net *.split]
[21:11:34] -!- AshKyd has quit [*.net *.split]
[21:11:37] -!- Magnifikus has quit [*.net *.split]
[21:11:40] -!- Khetzal has quit [*.net *.split]
[21:11:42] -!- awallin has quit [*.net *.split]
[21:11:44] -!- kengu has quit [*.net *.split]
[21:11:45] -!- cox_ has quit [*.net *.split]
[21:11:47] -!- toxx has quit [*.net *.split]
[21:11:49] -!- ir2ivps8 has quit [*.net *.split]
[21:11:52] -!- Lasper has quit [*.net *.split]
[21:11:52] -!- ybon has quit [*.net *.split]
[21:11:53] -!- sliptonic has quit [*.net *.split]
[21:14:03] OhmEye is now known as Guest36480
[21:16:06] -!- awallin [awallin!awallin@2001:1bc8:1004::1] has joined #linuxcnc-devel
[21:20:33] -!- cox [cox!~quassel@188.226.208.53] has joined #linuxcnc-devel
[21:20:58] -!- Khetzal [Khetzal!~khetzal@sierra.khetzal.info] has joined #linuxcnc-devel
[21:22:36] -!- zeeshan [zeeshan!~kvirc64@CPE0018e7cea342-CM5039555db2cc.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
[21:23:41] -!- Stoneanv_ has quit []
[21:24:13] -!- Patang [Patang!~freenode@cm-84.211.101.176.getinternet.no] has joined #linuxcnc-devel
[21:26:00] -!- sliptonic has quit [Ping timeout: 264 seconds]
[21:26:00] -!- P1ersson has quit [Ping timeout: 264 seconds]
[21:26:30] -!- Roguish_ [Roguish_!~chatzilla@c-50-143-183-159.hsd1.ca.comcast.net] has joined #linuxcnc-devel
[21:27:17] -!- skunkworks [skunkworks!~chatzilla@str-broadband-ccmts-ws-26.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[21:33:42] <jepler> JT-Shop: that's fine, leave jepler10xx because I use that to test how the forum pages look to non-admins
[21:34:39] <jepler> I'm not clear on why you think it will help to re-send activation notices. As far as extensions added to the website, the important thing to me is that it will be able to update through the regular update process, and that those updates are free indefinitely. Otherwise we end up with a website that cannot be updated.
[21:35:28] <jepler> for that that specific extension I can't tell whether it will auto update. I also see they have terms to agree to and I didn't review them personally to know whether I can agree with them or not.
[21:35:55] <jepler> afl
[21:35:57] <jepler> afk
[21:35:59] <jepler> not sure what l is
[21:38:36] -!- AphelionZ has quit [Ping timeout: 264 seconds]
[21:39:14] <JT-Shop> I was just searching for joomla activation email and came across it
[21:40:54] <JT-Shop> I see jepler1108, jepler1111, jepler1129, ttest2 as well as the regular jepler one
[21:43:09] <jepler> jepler and jepler1108 are the ones I use
[21:46:21] -!- AphelionZ has quit [Changing host]
[21:47:42] -!- Deejay has quit [Quit: bye]
[21:50:11] -!- Roguish_ has quit [Remote host closed the connection]
[21:50:11] -!- P1ersson has quit [Ping timeout: 264 seconds]
[21:50:37] <JT-Shop> I created 5 accounts while waiting for solidworks to think and I got emails from all of them...
[21:52:24] -!- ybon has quit [Ping timeout: 264 seconds]
[21:54:59] -!- Roguish_ [Roguish_!~chatzilla@50.143.183.159] has joined #linuxcnc-devel
[21:57:05] -!- Martiini [Martiini!~Martin@83-245-238-100-nat-p.elisa-mobile.fi] has joined #linuxcnc-devel
[21:57:13] -!- AshKyd has quit [Ping timeout: 264 seconds]
[22:01:41] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[22:03:45] -!- tris has quit [Excess Flood]
[22:06:54] -!- SkramX has quit [Ping timeout: 264 seconds]
[22:43:16] -!- logger[psha] [logger[psha]!~loggerpsh@195.135.238.205] has joined #linuxcnc-devel
[22:44:56] -!- ssi [ssi!~ssi@app2.prototechnical.com] has joined #linuxcnc-devel
[22:46:37] -!- putnik has quit [Changing host]
[22:46:47] McAFK is now known as McBride36
[22:50:39] <KGB-linuxcnc> 03John Thornton 052.6 b8bc0ad 06linuxcnc 10docs/src/gcode/gcode.txt Docs: restore line numbers to example g code. * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=b8bc0ad
[22:51:06] <jthornton> when I commit to a branch and want to merge the commit up what do I do?
[22:55:15] -!- bluemaex has quit [Ping timeout: 240 seconds]
[22:57:37] <cradek_> git checkout 2.7, then git merge 2.6, then git checkout master, then git merge 2.7
[22:57:41] cradek_ is now known as cradek
[22:58:09] -!- cradek has quit [Changing host]
[22:58:09] -!- cradek [cradek!~chris@emc/board-of-directors/cradek] has joined #linuxcnc-devel
[22:58:09] -!- mode/#linuxcnc-devel [+v cradek] by ChanServ
[22:59:04] -!- arekm has quit [Changing host]
[22:59:10] -!- OhmEye has quit [Ping timeout: 240 seconds]
[23:00:08] -!- basiclaser has quit [Quit: Connection closed for inactivity]
[23:02:07] LeelooMinai_ is now known as LeelooMinai
[23:02:32] -!- Akex_ has quit [Read error: Network is unreachable]
[23:02:48] <jthornton> cradek: thanks
[23:03:14] -!- teepee has quit [Ping timeout: 240 seconds]
[23:03:30] -!- chris_99 has quit [*.net *.split]
[23:03:30] -!- xrr has quit [*.net *.split]
[23:03:30] -!- Sarvihepo has quit [*.net *.split]
[23:04:34] -!- teepee [teepee!~teepee@unaffiliated/teepee] has joined #linuxcnc-devel
[23:04:48] <KGB-linuxcnc> 03John Thornton 052.7 e1c8027 06linuxcnc 03docs/src/gcode/g-code.txt Merge branch '2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=e1c8027
[23:05:09] -!- chris_99 has quit [Remote host closed the connection]
[23:05:37] Connor1 is now known as Connor
[23:06:03] -!- chris_99 has quit [Remote host closed the connection]
[23:07:30] OhmEye is now known as Guest30843
[23:08:47] <jthornton> git merge 2.7 Auto-merging debian/changelog CONFLICT (content): Merge conflict in debian/changelog Auto-merging VERSION CONFLICT (content): Merge conflict in VERSION Automatic merge failed; fix conflicts and then commit the result.
[23:10:06] <cradek> you'll have to combine the changelog manually so it has the 2.7.3 items but then the correct version for master at the top; for VERSION just pick the master side
[23:10:33] <cradek> I'd be happy to do that merge if you don't want to
[23:10:53] <jthornton> please do
[23:11:37] -!- kengu has quit [Ping timeout: 264 seconds]
[23:11:44] <jthornton> I'll look at what you do after the merge
[23:15:04] <KGB-linuxcnc> 03Chris Radek 05master 904187e 06linuxcnc 10debian/changelog Merge branch '2.7' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=904187e
[23:15:55] -!- JT-Shop has quit [Read error: Connection reset by peer]
[23:17:00] -!- sanjayb has quit [Ping timeout: 264 seconds]
[23:17:02] -!- taruti has quit [*.net *.split]
[23:17:45] <jthornton> I got it thanks
[23:18:12] <cradek> no problem
[23:18:28] <cradek> it's easy if you've done it a hundred times
[23:18:36] <jthornton> I bet it is
[23:18:46] -!- JT-Shop [JT-Shop!~JT@172.243.160.48] has joined #linuxcnc-devel
[23:18:46] <jthornton> like anything easy once you know how
[23:20:36] -!- Magnifikus has quit [Ping timeout: 264 seconds]
[23:20:55] -!- tinkerer has quit [Remote host closed the connection]
[23:27:48] -!- AshKyd has quit [Ping timeout: 264 seconds]
[23:37:04] -!- AphelionZ has quit [Read error: Connection reset by peer]
[23:38:16] -!- seb_kuzminsky [seb_kuzminsky!~seb@184-96-188-158.hlrn.qwest.net] has joined #linuxcnc-devel
[23:38:16] -!- mode/#linuxcnc-devel [+v seb_kuzminsky] by ChanServ
[23:42:48] -!- amatecha__ has quit [Ping timeout: 264 seconds]
[23:43:46] -!- Camaba has quit [Quit: Leaving]
