jepler: I've only had the chance to run thc once... afaik it works. The plasma cutter has been covered up with Hardinge parts
hm, if I run those git package builds from buidlbot, I'll get master and not v2.4_branch
yeah, I think that's true at the moment
seb wants me to do something with tags, but I ignored him and let it scroll away
hey I think the visual touchy stuff in 2.4 looks right
and my tool table converted right!
(but it sure is harder to read...)
maybe you want to try the tool table editor gui
hey you might be right
hm, lots of 'extra' columns now...
I need a better way to keep track of what tool is what
if my pockets were marked it wouldn't be quite so bad, but still kind of bad
maybe I need a chalk board or some other silly low-tech thing
I just need to do git checkout v2.4_branch after build-dep and build-essential to get 2.4 on the Hardinge?
yeah pretty much
jepler: can we now have the dro, program listing, mdi entry, mdi history, active gcodes all be the same font? I think right now they are all subtly different. Or are there apples and oranges here?
cradek: the overlay dro is going to be different, unfortunately; there's no reason the rest can't be the same
on systems with tk8.5 both the overlay dro and the widget fonts are coming from the same font renderer, but described using different intermediate APIs
hmph, tk8.5 may have antialiased fonts but they still don't follow the gnome font preferences
today is definitely an "I hate Tk" day. I think I just spent two hours trying and failing to get "_File" to look the same in wish8.5 and a gnome app
but with glrefactor merged into master, I can forget all that and just wait for someone to rewrite axis as a pygtk program for emc2.5.
if I want to make a little one-line fix in 2.4 and master, how do I do it?
[19:19:52] <cradek> http://timeguy.com/cradek-files/emc/gitk.png
is this what I do? I think the magenta line comes from the merge-base, way down there
git push --dry-run gives my one commit plus a merge commit for each of v2.4_branch and master
yes, I think so.
ok. my little branch with one commit won't get pushed, will it?
not if it's not shown by push --dry-run
it would show as [new branch] if it was being pushed
I think you have to specify new branches explicitly(?)
yeah, push branchname origin, I think
it would be nice if you guys figure out the preferred way of doing this, and add it to the wiki
if only I could remember all the fiddly little things I'd been wanting to fix before 2.4...
EMC: 03cradek 07master * rf7b45ba8968e 10/src/emc/usr_intf/touchy/emc_interface.py: Merge branch 'touchy-feedhold'
EMC: 03cradek 07v2.4_branch * rb71806a55bd4 10/src/emc/usr_intf/touchy/emc_interface.py: Merge branch 'touchy-feedhold' into v2.4_branch
EMC: 03cradek 07master * rda874d2ed681 10/src/emc/usr_intf/touchy/emc_interface.py: make the single block switch work more like a feed hold
well ok, I guess that did a reasonable thing
it seems that 2.4 branch will be more open to minor functional changes than 2.3 branch?
especially if they are stabilizing/final bugfix type changes
hm, I should have probably said 'ask jepler'
EMC: 03cradek 07master * r128ce393cfd2 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): Merge branch 'touchy-rpmreadout'
EMC: 03cradek 07master * rc002e292777f 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): add a spindle speed readout on the manual tab
EMC: 03cradek 07v2.4_branch * re0faf4266880 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): Merge branch 'touchy-rpmreadout' into v2.4_branch