Back
[03:17:46] <cradek> well I finally paid for workshop...
[03:19:24] <jmkasunich> heh, I got around to that last week
[03:19:41] <SWPadnos> heh
[03:21:31] <cradek> I have so much to get ready. I have not started.
[03:21:57] <jmkasunich> ditto
[03:22:04] <jmkasunich> I'm taking friday off to load up
[03:22:06] <cradek> I may have to install the machines, etc, after I get there.
[03:22:18] <jmkasunich> will probably make a final HGR run on friday
[03:22:24] <cradek> I took monday off to recover, so I didn't want to also take friday, although I could sure use it.
[03:22:43] <cradek> uh-oh I better go look for QC30 stuff again then
[03:23:02] <cradek> since you know how well that went last time...
[03:23:04] <jmkasunich> I think most of the entries we had bookmarked are gone
[03:23:25] <jmkasunich> one advantage of friday is they are less busy
[03:26:25] <cradek> dang:
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=42-481-021&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[03:26:47] <jmkasunich> probably not QC
[03:26:51] <jmkasunich> they have retention knobs
[03:26:54] <cradek> no they sure aren't
[03:27:09] <cradek> hmm they still show these:
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=80-131-006&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[03:27:43] <cradek> I don't remember if you found this bin and it was empty, or you didn't find it at all
[03:27:46] <jmkasunich> dang - I had two lots of collet chucks bookmarked, they're gone
[03:27:56] <jmkasunich> never found it
[03:28:25] <cradek> that stinks, those are the ones I'd really like.
[03:28:33] <jmkasunich> the one that was picked over was the small plastic bin with the shell mills
[03:28:38] <jmkasunich> I can look again
[03:29:09] <cradek> are these some useful straight shank thing for you?
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-247-262&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=1
[03:29:16] <cradek> I can't figure out what they are
[03:29:33] <jmkasunich> the shanks look threaded
[03:29:44] <cradek> oh you're right
[03:30:01] <cradek> well not all - some have a key
[03:30:26] <cradek> might be worth a look anyway
[03:30:36] <jmkasunich> either way, they're probably for some specific machine
[03:30:42] <jmkasunich> they get lots of that kind of stuff
[03:30:48] <jmkasunich> screw machines, etc
[03:37:14] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=05-530-740&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=5
[03:37:23] <jmkasunich> old school
[03:37:32] <cradek> neat
[03:38:31] <jmkasunich> wish I could tell what size these are
[03:38:32] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-654&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=1
[03:39:09] <cradek> my guess is 1/2
[03:40:49] <jmkasunich> 100' of 3/4 liquitite flex conduit for $20
[03:41:57] <SWPadnos> that's a good deal
[03:42:08] <SWPadnos> much better than when I misread the price at $250
[03:42:34] <jmkasunich> I wonder if I could sell it at $5 for 10 feet at the workshop?
[03:42:56] <cradek> only if people happen to need it
[03:43:03] <jmkasunich> yeah
[03:43:09] <SWPadnos> everyone needs it, they just may not know that
[03:43:11] <jmkasunich> it comes in handy when doing conversions
[03:43:15] <cradek> it's not neat enough to get people to impulse buy it
[03:43:35] <SWPadnos> it's hard to cut though, if it's the metal-core type
[03:43:40] <jmkasunich> but only if your machine doesn't already have conduit runs, _and_ you care enough to use conduit and not just run cable
[03:43:52] <SWPadnos> right
[03:44:10] <SWPadnos> I can bring a demo cable to show off the advantages of using conduit ;)
[03:44:58] <jmkasunich> "bag of rags" $45
[03:45:01] <jmkasunich> I mean 25
[03:46:02] <SWPadnos> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-542&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[03:46:18] <jmkasunich> ohh, shiny
[03:46:25] <SWPadnos> yeah
[03:46:37] <jmkasunich> rich for my tastes tho
[03:46:52] <SWPadnos> also this one:
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-547&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[03:46:59] <SWPadnos> richer ;)
[03:47:22] <jmkasunich> can't tell what the nose is - that's pretty important
[03:49:14] <SWPadnos> damn -looks new:
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=12-276-568&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[03:49:28] <jmkasunich> sure does
[03:49:33] <jmkasunich> and less rich
[03:49:37] <jmkasunich> (a little)
[03:50:03] <SWPadnos> and two of them in there
[03:50:31] <jmkasunich> I'm sure the price is per each
[03:50:37] <SWPadnos> that company makes motors, and those look like they have motors on the top
[03:50:50] <jmkasunich> yeah, and electrical specs
[03:51:28] <jmkasunich> if they were 1/5 the price I'd maybe be tempted
[03:51:44] <SWPadnos> looks like 3 phase, 60HZ, 230/400V
[03:51:55] <jmkasunich> which doesn't make sense
[03:52:00] <jmkasunich> you don't get that speed from 60Hz
[03:52:28] <SWPadnos> they're probably mixing up specs from the motor and the spindle
[03:52:46] <SWPadnos> the spindle should be rated for a max speed and max HP, but the motor may not provide that
[03:52:50] <jmkasunich> I'm assuming its direct drive
[03:53:07] <jmkasunich> and a motorized spindle assembly is probably rated by what the assembly can do
[03:53:10] <SWPadnos> or they have a cut/paste error for the "additional information"
[03:53:24] <SWPadnos> sure, but who knows where the person read the specs from :)
[03:53:42] <jmkasunich> bookmarked, just to take a look
[03:53:57] <jmkasunich> (are you potentially interested, or just browsing?)
[03:54:38] <jmkasunich> 175A 15,000V fuse
[03:54:44] <jmkasunich> just what I needed
[03:54:45] <SWPadnos> mostly browsing, but that could be interesting, especially if one could convince them that both go for one low price :)
[03:54:55] <jmkasunich> keep dreaming
[03:55:19] <SWPadnos> heh
[04:01:12] <jmkasunich> renishaw, but not sure what it does
[04:01:12] <jmkasunich> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=42-496-622&searchtable=2&sortExpression=wbprice&SortASC=Yes&pageSize=50¤tPageIndex=24
[04:01:44] <cradek> just probe extensions maybe?
[04:01:59] <jmkasunich> dunno, you're the one with the renishaw
[04:02:18] <cradek> 1,2,4" could give you a lot of extension options
[04:02:48] <jmkasunich> the ends aren't the same, so it doesn't seem like you could stack them
[04:03:10] <jmkasunich> do the ends look even remotely like they'd fit your probe?
[04:03:46] <cradek> nope
[04:03:54] <cradek> oh heyyyy
http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=30-589-073&searchtable=2&sortExpression=&SortASC=&pageSize=50¤tPageIndex=1
[04:03:58] <cradek> wonder if those are 3/4
[04:04:09] <jmkasunich> dunno
[04:04:22] <jmkasunich> those look like ones that I had book marked and thought were gone
[04:04:30] <cradek> huh
[04:04:42] <jmkasunich> can't be sure
[04:08:04] <SWPadnos> http://www.hgrindustrialsurplus.com/search-products/product-detail.aspx?id=90-163-149&searchtable=1&sortExpression=&SortASC=&pageSize=50¤tPageIndex=0
[04:08:39] <cradek> but cat40 doesn't fit any of our machines
[04:08:49] <jmkasunich> heh, some things get mislabeled - an ignitron tube classified as a fuse
[04:09:16] <SWPadnos> oh - were those cat40? oops
[04:09:50] <cradek> always a little hard to be sure
[04:11:17] <SWPadnos> especially for me, since I don't really know what to look for ;)
[04:13:27] <jmkasunich> well, I bookmarked a few things
[04:13:35] <jmkasunich> I'll check again friday before I go
[04:13:46] <jmkasunich> after midnight again.....
[04:14:26] <cradek> goodnight
[04:15:28] <SWPadnos> indeedy. night guys
[04:15:36] <jmkasunich> goodnight
[19:29:43] <SWPadnos> gah! how the hell do you get git to let you merge a remote repo with a local repo, when you don't have explicit knowledge of what the common head is?
[19:33:05] <fenn> is this a hypothetical situation?
[19:36:08] <SWPadnos> no
[19:38:19] <jepler> I don't think you *can* merge in that case
[19:40:40] <fenn> i guess you could just pick a spot and say that's the common ancestor
[19:41:58] <SWPadnos> well, the actual problem is that I made some changes without pulling first, and now I can't push because the remote tree changed in the meantime
[19:42:43] <fenn> if you pull from the remote tree it'll merge with your local copy
[19:43:14] <jepler> yeah the scenario you describe shouldn't be a problem
[19:43:47] <jepler> what does git-pull actually say now?
[19:45:01] <fenn> are you going to be using git during the fest?
[19:45:52] <alex_joni> fenn: different project
[19:46:04] <SWPadnos> fatal: entry control.cpp not uptodate. Cannot merge.
[19:46:21] <SWPadnos> fatal: Entry 'control.cpp' not uptodate. Cannot merge.
[19:46:30] <SWPadnos> Merge with Strategy recursive failed
[19:46:44] <SWPadnos> (only one fatal line though)
[19:47:11] <jepler> SWPadnos: OK, git won't actually perform the merge because you have the changes in your local tree.
[19:47:30] <jepler> SWPadnos: so first commit your changes, then merge. You'll get a little diamond shape in your history if you do that.
[19:48:43] <cradek> can't it do the thing cvs up does, where it merges in the master's changes, keeping your local changes on top?
[19:50:13] <jepler> Git doesn't allow a merge if you have uncommited changes, either your
[19:50:13] <jepler> changes are irrelevant and you want to "git reset --hard", or they
[19:50:14] <jepler> are, and you want to commit (and perhaps use "rebase"), or stash them.
[19:50:20] <jepler> http://marc.info/?l=git&m=120272539627389&w=2
[19:51:08] <cradek> I bet rebase is what I remember hearing about
[19:51:10] <jepler> I'm not sure what stash does
[19:51:12] <cradek> * cradek <- not a git user
[19:51:26] <SWPadnos> I had added the changed files, and then committed (to the local repo), then tried to push the changes, which is when the errors started showing up
[19:51:54] <jepler> does 'git status' list control.cpp as modified now?
[19:52:49] <SWPadnos> no, but I had re-saved it after undoing all the edits (it was still open in the editor)
[19:53:22] <SWPadnos> I essentially backed out the edits to the 2 or 3 files then pulled, and now I'm looking at the differences
[19:55:46] <jepler> so at this point are you just trying to get whatever is on the remote master and work from there?
[19:56:16] <SWPadnos> not really - I'm trying to commit changes I've done here so they can use them
[19:56:44] <SWPadnos> I'm trying to get my local stuff to the remote master (if it is a master - I'm not sure of the terminology)
[19:56:53] <SWPadnos> I cloned from it
[19:57:14] <jepler> er, I guess it's called 'origin' and its head is 'master'
[19:57:18] <jepler> whatever, I get the lingo wrong too
[19:58:12] <SWPadnos> it seemed as though I couldn't use the remote URL in some places I thought I should be able to, but I could have been mistyping it
[20:02:54] <jepler> I think you should try: stash / pull / stash apply or commit / pull
[20:03:07] <jepler> you could make a copy of the whole thing before doing it in case the results aren't what you wanted :-P
[20:03:16] <SWPadnos> heh
[20:03:29] <jepler> also I think you should stop saying you're confused about git, since I'm trying to force cradek to adopt it for the office :-P
[20:03:30] <SWPadnos> it looks like most of the changes got merged (or something like that)
[20:03:36] <cradek> bleh
[20:03:45] <SWPadnos> there are only a couple of lines that need to change
[20:04:15] <SWPadnos> oh, I like it just fine, but I'm going through the same startup woes as with CVS, SVN, bitkeeper, etc.
[20:04:40] <SWPadnos> oh, and LabView, which has its own semi-revision-management system
[22:16:34] <SWPadnos> I've got a bunch of CD jewel cases I'm bringing - does someone have CDR blanks to take along?
[22:16:51] <SWPadnos> I may have some, but I'm not sure (and they'd be a year or two old)
[22:17:36] <SWPadnos> oh - there's a stack of 100. I guess I'll bring it
[22:54:48] <jmkasunich> my cd blanks are ancient
[22:55:24] <jmkasunich> * jmkasunich <--- on VACATION!
[23:11:25] <skunkworks> woo HOO! :)