Back
[00:00:44] <andypugh> So, I made a new commit, then Dewey made some, and so I couldn’t push without a pull, but now if I push there is a merge as part of the push. Can I just reset —hard and then cherry-pick my commit to the tip of master, or will the reset delete the commit?
[00:03:55] <cradek> you can git pull --rebase and it'll move yours on top of his
[00:04:02] amnesic_away is now known as amnesic
[00:04:14] <cradek> er, not if you've already created the merge
[00:04:53] <andypugh> Well, git pull did the merge without asking
[00:05:30] <cradek> yeah, it does that unless you use --ff-only
[00:05:41] <cradek> the merge is fine, don't sweat it
[00:05:51] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.7-checklink 03b6e80 06linuxcnc 10docs/src/checkref get some debug output from the buildbot * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=03b6e80
[00:06:02] <cradek> you could change it around if you care, but whatevs
[00:06:44] <KGB-linuxcnc> 03andypugh 05master 1bcd51e 06linuxcnc 10docs/src/gui/gladevcp.txt 10src/emc/usr_intf/touchy/touchy.py GladeVCP: Send a message from Touchy to an embedded GladeVCP tab to tell * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=1bcd51e
[00:07:32] <andypugh> reset —hard desn’t stop you cherrypicking the commit (it wasn’t much of a gamble, I had the changed files still open in a text editor_
[00:12:07] Daerist is now known as Daerist`
[00:12:28] -!- Daerist84 has quit [Client Quit]
[00:38:15] -!- logger[psha] [logger[psha]!~loggerpsh@195.135.238.205] has joined #linuxcnc-devel
[00:50:16] <pcw_mesa> its in 2.7.8
[00:56:06] <cradek> there are no changes in 2.7.8 that are not also in master
[00:57:13] <pcw_mesa> hmm... Let me try again
[01:05:20] <pcw_mesa> OK so neither work for some reason (no module named numpy.core)
[01:17:54] -!- andypugh has quit [Quit: andypugh]
[01:25:34] <seb_kuzminsky> rut roh
[02:04:34] -!- logger[psha] [logger[psha]!~loggerpsh@195.135.238.205] has joined #linuxcnc-devel
[02:05:00] -!- skunkworks [skunkworks!~skunkwork@str-broadband-ccmts-ws-26.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[02:05:08] <skunkworks> zlog
[02:05:09] <zlog> skunkworks: Log stored at
http://tom-itx.no-ip.biz:81/~tom-itx/irc/logs/%23linuxcnc-devel/2016-11-09.html
[02:06:30] -!- zeeshan [zeeshan!~kvirc64@CPE84948c379051-CM84948c379050.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
[02:12:00] <seb_kuzminsky> pcw_mesa: do you have python-numpy installed?
[02:15:14] <seb_kuzminsky> it's a runtime dependency of the linuxcnc deb, but src/configure doesn't check for it
[02:15:21] <pcw_home> I thought I did
[02:15:22] <seb_kuzminsky> so if you're running-in-place, it won't warn you
[02:15:23] <pcw_home> I'll check tommorow
[02:15:40] <seb_kuzminsky> ok
[02:15:47] <pcw_home> Yeah I'm RIP
[02:24:58] amnesic is now known as amnesic_away
[02:28:56] <seb_kuzminsky> i bet that's it
[03:16:17] -!- tchaddad has quit [Remote host closed the connection]
[03:49:23] -!- kingarmadillo has quit [Ping timeout: 246 seconds]
[03:56:23] -!- zeeshan has quit [Quit: KVIrc 4.3.1 Aria http://www.kvirc.net/ - 64bit Windows version by http://kvirc.d00p.de/]
[04:10:44] -!- tchaddad has quit [Remote host closed the connection]
[04:13:45] -!- tchaddad has quit [Read error: Connection reset by peer]
[04:44:01] -!- sanjayb has quit [Quit: ZNC - http://znc.in]
[04:46:52] -!- kalxas has quit [Quit: Goodbye]
[05:40:06] -!- ve7it has quit [Remote host closed the connection]
[05:50:19] -!- kingarmadillo has quit [Ping timeout: 256 seconds]
[05:51:58] -!- tchaddad_ has quit [Remote host closed the connection]
[07:01:56] -!- terkaa [terkaa!~terkaa@dsl-olubrasgw1-50dcad-121.dhcp.inet.fi] has joined #linuxcnc-devel
[07:02:03] <terkaa> Hi everyone
[07:02:15] <terkaa> I am just trying to learn working with git
[07:02:25] <terkaa> Is this usable
https://github.com/terkaa/linuxcnc
[07:11:43] -!- kwallace_ofcb [kwallace_ofcb!~kwallace@162.222.30.253] has parted #linuxcnc-devel
[07:14:37] -!- KimK has quit [Ping timeout: 240 seconds]
[07:26:05] -!- terkaa has quit [Quit: Lähdössä]
[07:26:49] -!- terkaa [terkaa!~androirc@37-219-31-44.nat.bb.dnainternet.fi] has joined #linuxcnc-devel
[07:28:24] -!- KimK [KimK!~Kim__@2600:8803:7a85:6d00:ddef:8857:ac57:9501] has joined #linuxcnc-devel
[07:49:42] -!- tchaddad has quit [Remote host closed the connection]
[07:50:28] -!- kingarmadillo has quit [Ping timeout: 245 seconds]
[07:55:26] -!- tchaddad has quit [Ping timeout: 256 seconds]
[08:42:36] -!- sel [sel!~sel@net77-43-27-64.mclink.it] has joined #linuxcnc-devel
[08:45:49] -!- sel has quit [Client Quit]
[09:20:36] -!- terkaa has quit [Quit: AndroIRC - Android IRC Client ( http://www.androirc.com )]
[09:24:38] -!- M-IvanSanchez has quit [Ping timeout: 245 seconds]
[09:51:27] -!- kingarmadillo has quit [Ping timeout: 265 seconds]
[10:06:56] -!- b_b has quit [Changing host]
[10:32:23] -!- mk0 [mk0!~Orr@fiztech.basnet.by] has joined #linuxcnc-devel
[10:50:32] -!- kingarmadillo has quit [Ping timeout: 260 seconds]
[11:00:04] -!- mk0_ [mk0_!~Orr@fiztech.basnet.by] has joined #linuxcnc-devel
[11:00:05] -!- mk0 has quit [Read error: Connection reset by peer]
[11:04:48] -!- mk0_ has quit [Read error: Connection reset by peer]
[11:05:25] -!- mk0 [mk0!~Orr@fiztech.basnet.by] has joined #linuxcnc-devel
[11:52:52] -!- kalxas has quit [Changing host]
[11:56:49] -!- b_b has quit [Remote host closed the connection]
[11:57:21] -!- b_b has quit [Changing host]
[11:57:58] -!- skunkworks has quit [Ping timeout: 256 seconds]
[12:15:27] -!- steves_logging has quit [Read error: Connection reset by peer]
[12:17:02] -!- terkaa [terkaa!~terkaa@dsl-olubrasgw1-50dcad-121.dhcp.inet.fi] has joined #linuxcnc-devel
[12:28:58] -!- mk0 has quit [Quit: Leaving]
[12:39:12] <jthornton> where are the predefined parameters in the code? The docs seem to be behind...
[12:40:19] <jthornton> never mind I found #<_feed> in the docs
[13:04:18] -!- kingarmadillo has quit [Ping timeout: 265 seconds]
[13:04:50] -!- marshmn has quit [Ping timeout: 244 seconds]
[13:35:37] -!- tchaddad has quit [Ping timeout: 240 seconds]
[13:52:44] <KGB-linuxcnc> 03John Thornton 052.7 c28692e 06linuxcnc 10docs/src/gcode/overview.txt Docs: correct misleading descriptions * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=c28692e
[13:55:52] -!- skunkworks [skunkworks!~skunkwork@68-115-41-210.static.eucl.wi.charter.com] has joined #linuxcnc-devel
[14:11:32] -!- terkaa has quit [Quit: Lähdössä]
[14:11:49] -!- JT-Shop has quit [Quit: Leaving]
[14:12:08] -!- terkaa [terkaa!~androirc@37-219-31-44.nat.bb.dnainternet.fi] has joined #linuxcnc-devel
[14:12:21] -!- JT-Shop [JT-Shop!~john@198.45.191.246] has joined #linuxcnc-devel
[14:38:13] -!- kwallace_ofcb [kwallace_ofcb!~kwallace@162.222.30.253] has joined #linuxcnc-devel
[14:41:58] <seb_kuzminsky> terkaa: yeah that's on the right track
[14:43:03] <seb_kuzminsky> it would be easier for you if you did your work on a feature branch, not on the default "master" branch, but it's not a show-stopper
[14:44:14] <seb_kuzminsky> it'd be easier for us if your commit messages had more detailed descriptions of what the commit did
[14:44:32] <seb_kuzminsky> we have some guidelines on "effective use of git" here:
http://linuxcnc.org/docs/devel/html/code/contributing-to-linuxcnc.html#_effective_use_of_git
[14:45:19] <seb_kuzminsky> and finally, your commits need to be "signed off":
http://linuxcnc.org/docs/devel/html/code/contributing-to-linuxcnc.html#_signed_off_by_policy
[14:47:34] <terkaa> Ok I will study these
[15:06:23] amnesic_away is now known as amnesic
[15:09:18] amnesic is now known as amnesic_away
[15:10:22] -!- pragmaticus has quit [Read error: Connection reset by peer]
[15:10:46] <seb_kuzminsky> i still haven't read your code in detail, these are all just simple mechanical issues
[15:17:34] amnesic_away is now known as amnesic
[15:29:21] -!- ktchk [ktchk!~eddie6929@n219079250092.netvigator.com] has joined #linuxcnc-devel
[15:52:48] -!- tchaddad has quit [Remote host closed the connection]
[16:00:05] -!- ktchk has quit [Read error: Connection reset by peer]
[16:06:29] -!- steve_stallings [steve_stallings!~Steve@wsip-70-182-2-252.dc.dc.cox.net] has joined #linuxcnc-devel
[16:06:43] steve_stallings is now known as steves_logging
[16:13:30] amnesic is now known as amnesic_away
[16:45:30] -!- miccolis has quit [Client Quit]
[16:51:54] -!- samcfc has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client]
[17:32:57] Tom_itx is now known as Tom_L
[17:40:46] -!- terkaa has quit [Quit: AndroIRC - Android IRC Client ( http://www.androirc.com )]
[17:41:46] -!- terkaa [terkaa!~terkaa@a91-155-72-157.elisa-laajakaista.fi] has joined #linuxcnc-devel
[17:46:08] <terkaa> Added more comments, signed off
[19:03:19] <mozmck> seb_kuzminsky: have you had a chance to look at issue #177?
[19:03:35] <mozmck> https://github.com/LinuxCNC/linuxcnc/issues/177
[19:04:19] <mozmck> I was able to duplicate that just now. I'm somewhat surprised I didn't figure out how to trigger that problem myself sooner.
[19:17:01] <KGB-linuxcnc> 03John Thornton 052.7 9708593 06linuxcnc 10docs/src/config/integrator-concepts.txt Docs: add info about the basic directory structure * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=9708593
[19:21:53] -!- md-2 has quit [Quit: Leaving...]
[19:27:50] -!- terkaa has quit [Quit: Leaving]
[19:38:25] -!- kingarmadillo has quit [Ping timeout: 252 seconds]
[19:44:47] <pcw_mesa> seb_kuzminsky: yeah I forgot to install numpy on that system, but it (Mint18) still has
[19:44:48] <pcw_mesa> (Python version?) issues
[19:46:00] <pcw_mesa> File "/usr/lib/python2.7/dist-packages/PIL/Image.py", line 695, in tostring
[19:46:02] <pcw_mesa> "Please call tobytes() instead.")
[19:46:04] <pcw_mesa> Exception: tostring() has been removed. Please call tobytes() instead.
[19:47:47] -!- terkaa [terkaa!~terkaa@a91-155-72-157.elisa-laajakaista.fi] has joined #linuxcnc-devel
[19:50:36] -!- tchaddad has quit [Remote host closed the connection]
[19:59:41] <skunkworks> mozmck, do you think that is what your customer was seeing?
[20:07:47] -!- terkaa has quit [Quit: Leaving]
[20:08:22] -!- terkaa [terkaa!~androirc@37-219-31-44.nat.bb.dnainternet.fi] has joined #linuxcnc-devel
[20:30:50] -!- rob_h [rob_h!~R@97e4291b.skybroadband.com] has joined #linuxcnc-devel
[20:33:08] <seb_kuzminsky> pcw_mesa: whoops!
[20:33:22] <seb_kuzminsky> do you know if the wheezy (et al) numpy has tobytes()?
[20:51:48] <pcw_mesa> let me check
[20:52:20] -!- skunkworks has quit [Ping timeout: 250 seconds]
[21:14:55] <pcw_mesa> Not exactly sure where to look
[21:20:17] -!- b_b has quit [Remote host closed the connection]
[21:27:25] -!- andypugh [andypugh!~andypugh@cpc14-basl11-2-0-cust1010.20-1.cable.virginm.net] has joined #linuxcnc-devel
[21:39:20] -!- marshmn has quit [Ping timeout: 246 seconds]
[21:51:00] <seb_kuzminsky> pcw_mesa:
[21:51:02] <seb_kuzminsky> python -c "import PIL.Image; print 'tobytes' in dir(PIL.Image.Image)"
[22:04:39] -!- chillly has quit []
[22:08:36] -!- kalxas has quit [Quit: Goodbye]
[22:32:41] <cradek> False
[22:42:21] <cradek> ... , 'tell', 'thumbnail', 'tobitmap', 'tostring', 'transform', 'transpose', 'verify']
[22:48:40] -!- BeachBumPete [BeachBumPete!~IceChat9@2601:589:8201:bbc0:9c69:2b67:4eba:d690] has joined #linuxcnc-devel
[22:48:46] -!- BeachBumPete [BeachBumPete!~IceChat9@2601:589:8201:bbc0:9c69:2b67:4eba:d690] has parted #linuxcnc-devel
[22:50:29] -!- marshmn has quit [Ping timeout: 260 seconds]
[22:57:07] -!- kingarmadillo has quit [Ping timeout: 256 seconds]
[23:06:14] -!- ve7it [ve7it!~LawrenceG@S010648f8b3c3bc3b.pk.shawcable.net] has joined #linuxcnc-devel
[23:19:58] -!- micges [micges!~micges@dcc242.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[23:21:14] -!- racicot has quit [Excess Flood]
[23:22:19] <micges> mozmck: about issue #177: tp reset blending to g64 after aborting
[23:54:45] <seb_kuzminsky> cradek:
https://cdn.meme.am/instances/500x/9158596.jpg
[23:55:08] <seb_kuzminsky> mozmck: i've abandoned my effort to fix that and thrown my lot in with state-tags
[23:58:33] <cradek> I sympathize with that sentiment 99%
[23:58:35] -!- zeeshan [zeeshan!~kvirc64@CPE84948c379051-CM84948c379050.cpe.net.cable.rogers.com] has joined #linuxcnc-devel
