#emc-devel | Logs for 2010-08-28

[00:00:16] <Dave911> Yes! Humidity is pretty bad in northern indiana also at times also
[00:00:41] <JT-Hardinge> it is pretty bad here in Swamp East Missouri most of the time...
[00:00:46] <chester88> back in a minute
[00:01:38] <JT-Hardinge> * JT-Hardinge gets back to making floor space from piles of stuff...
[00:02:03] <Dave911> I'm sure it does....
[00:02:04] <Jymmm> JT-Hardinge: the sky is the limit =)
[00:02:41] <Dave911> Actually the limit is the ceiling.. :-)
[00:03:19] <Dave911> bbl gotta go clean up a painting job ...
[00:11:30] <chester88> ok dave911 I sent the email
[00:16:13] <chester88> jthornton are you building a machine shop?
[00:16:24] <chester88> or a hobby shop?
[00:18:46] <chester88> Dave911 email the list with comments if any > Cheers
[00:19:16] <JT-Hardinge> chester88: both lol
[00:19:40] <JT-Hardinge> I use the machines for both work and pleasure
[13:24:41] <morficmobile> much better :)
[13:53:24] <CIA-5> EMC: 03jepler 07master * r69f192a40417 10/src/Makefile: complete installation of gladevcp
[13:53:25] <CIA-5> EMC: 03jepler 07master * rc82ede900dbb 10/src/ (8 files in 4 dirs): remove execute bits that don't belong
[13:53:26] <CIA-5> EMC: 03jepler 07master * re7d72f893450 10/configs/plasma-thc/mp1000_serial.py.threadedNonSafe: remove file added by mistake
[21:58:57] <KimK_> I have entered "git branch --track v2.4_branch origin/v2.4_branch". Do I have to also enter "git branch --track master origin/master" (or something like that), or has that happened automatically already, because master is/was the default? And these two branch selections will be remembered until changed, right?
[22:23:23] <jepler> KimK_: the 'git clone' process does the equivalent of 'git branch --track master origin/master'
[22:28:02] <KimK_> jepler: OK. But I was thinking of after I have cloned. I expect to be using git/emc2-dev in both 2.4 and master, at different times for different purposes. I was wondering if (to update both branches) I have to do something like: checkout master, git pull --rebase, checkout 2.4, git pull --rebase ? Or does checkout master, git pull --rebase, adequately cover both branches?
[22:28:26] <KimK_> Does git keep track seperately?
[22:29:42] <KimK_> I guess is what I'm asking.
[22:30:56] <KimK_> Once I have declared two branches.
[22:33:05] <JT-Hardinge> yes
[22:37:16] <JT-Hardinge> * JT-Hardinge is off to dinner now
[22:52:43] <KimK_> OK, thank you both.
[23:53:24] <cradek> would one of you learned and revered C programmers check this please? http://timeguy.com/cradek-files/emc/0001-skip-invalid-tool-table-entries-instead-of-crashing.patch
[23:55:05] <cradek> it tests ok, but I'm not confident enough about break/continue in that nested stuff doing strtok. It (or a correct fix) should surely go on v2.4_branch