Back
[00:08:11] -!- servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[00:12:06] -!- toastydeath has quit [Ping timeout: 264 seconds]
[00:12:26] <cradek> andypugh: he's had net problems for days, and said he'd ping me when it's all working again. I had poked him asking about when it'd be working so I could do a 2.5.1 release.
[00:12:39] <cradek> I strongly suspect he knows about it and is working on it
[00:13:53] <andypugh> For some reason I thought the buildbot was your baby.
[00:17:01] <cradek> nope, it's seb's baby, and I'm sure glad
[00:17:44] <andypugh> Yeah, it looks like a demanding problem-child.
[00:18:08] <cradek> I'm hoping dgarr gets some time to work on the tuning program some more before 2.5.1, it's at least somewhat broken
[00:18:29] <cradek> so I'm in no hurry right now I guess
[00:21:49] <andypugh> I have a major re-hash of mesa smart-serial. I can't decide where it belongs.
[00:22:13] <cradek> is its primary purpose to fix bugs that are bothering users?
[00:23:26] <andypugh> No, but neither is it a new experimental feature. Hence my indecision.
[00:23:43] <cradek> hmm
[00:24:04] <cradek> I may not know enough to help, but the only thing that makes a slam-dunk for the release branch is a YES answer to that question
[00:24:24] <andypugh> There is a non-zero risk of breaking existing code, though, so I would have to do a lot of testing before thinking if it might be appropriate for 2.5.1 rather than 2.6
[00:24:49] <andypugh> Yeah, if it was a clear bug-fix then it's an easy answer
[00:25:18] <cradek> it's also good to see another person who's smart about the particular code review and test it in that case
[00:25:32] -!- BenceKovi118 has quit [Quit: Nettalk6 - www.ntalk.de]
[00:25:36] <cradek> (which may be a tall or impossible order for mesa sserial)
[00:25:37] -!- rob_h has quit [Ping timeout: 240 seconds]
[00:25:53] <andypugh> I was just about to make a comment to that effect ;-)
[00:27:31] <andypugh> It can probably wait for 2.6, unless 2.6 becomes 3.0 and moves more than a year into the future.
[00:28:37] <cradek> if you put it on master now and later also want it in another branch, that can happen
[00:29:25] <andypugh> Ah, OK, I thought nothing could swim upstream.
[00:31:05] <cradek> you'd have to use cherry-pick which is fine for the occasional wrong-direction thing you can't merge
[00:32:39] <andypugh> I will bear it in mind.
[00:33:27] <andypugh> The work might lead to a utility to flash firmware to sserial remotes. Which is a definite new feature, but might be useful and standalone enough to want to be released.
[00:33:35] <cradek> yeah you just end up with two commits instead of one
[00:34:25] <cradek> standalone is good as far as being sure about not breaking anything else, but you have to be sure to get packaging right
[00:34:36] <cradek> whatever you decide I'll try to help best I can
[00:36:02] <andypugh> Currently I have so many irons in the fire I don't know when I will finish it anyway.
[00:51:09] <KimK_> Hi andypugh, hi cradek, you guys might be just the ones to answer a question for me. If I was going to create a new branch, should it be from master or v2.5? Would it make any difference if I said my fiddling was thought to be minor changes that would be useful soon and not break existing behavior, vs. if I said they were major changes that would not be ready for a long time and might break existing behavior, then what would you say? Than
[00:51:09] <KimK_> ks!
[00:51:12] <KimK_> Oops.
[00:51:48] <cradek> tell us more about your task and goal
[00:55:47] <andypugh> You can always change your mind locally. If you had based the work on master, you can cherry-pick it into your local 2.5 branch before pushing. (You can cherry-pick with a right-click in gitk, by the way)
[00:56:13] <KimK_> Well, I have several things in mind, and they have different purposes. One would be to build on Andy's work on the Mesa resolver board, other things too. But what I was wondering about was if there is a general rule as to what to branch off of for various purposes, and how to determine this?
[00:56:54] <KimK_> Ah, thanks, Andy, I didn't know that
[00:57:06] <cradek> branch off the one you'd eventually like to merge your work into
[00:57:32] <cradek> if you might want to merge into two branches, you can find the proper branching point in that case too
[00:58:18] <KimK_> I'm not sure I follow you there
[00:58:54] <cradek> I think you're talking about a feature branch, and the point of that is usually to later merge it into somewhere for people to use
[00:59:10] <cradek> once you know what your intentions are for later merging, the branch point becomes obvious
[00:59:49] <KimK_> OK, but I'm not clear on your "merge into two branches..."
[01:01:57] <cradek> any two branches will have a common ancestor, and you can always start your feature branch there
[01:02:14] <cradek> this common ancestor is called the merge-base (see man git-merge-base to make it all "clear")
[01:02:27] <cradek> you usually don't have to worry about this
[01:02:59] <KimK_> OK, I think I understand now, thanks. So it sounds like generally if the changes are minor/easy, use v2.5 and if they're major/hard, use master?
[01:03:36] -!- tlab has quit [Quit: Leaving]
[01:04:01] <cradek> I wouldn't really choose to summarize it that way...
[01:04:07] <KimK_> or maybe I should say minor/easy/low disruption, and major/hard/high disruption ?
[01:04:13] <cradek> easy and hard are not absolutes
[01:04:46] <cradek> again I suggest considering where you will later want to merge the change
[01:05:01] <cradek> this may even mean considering stable branch/release policies
[01:06:26] <KimK_> OK, yes, thanks, I think that will give me the bigger picture that I was missing.
[01:07:10] <KimK_> How are things where you guys are?
[01:07:27] <andypugh> It is worth bearing in mind that it is easy for people to use the development branch if the feature they want is there. We can just point them at the buildbot.
[01:08:01] <andypugh> Here it is raining. It has been raining all year. The weather is seriously messed up.
[01:09:30] <KimK_> Ha, count yourself lucky. My taskbar shows 102F here, and that represents a cooling trend.
[01:09:39] <cradek> here it is hot hot hot, but seems to be much cooler tonight
[01:12:23] <KimK_> On another note, I hope to be getting back to LinuxCNC upgrades and related work before too long, as opposed to general CNC maintenance. So that's a good thing.
[01:12:43] <cradek> have you started on that Jr yet?
[01:13:27] <cradek> bbl
[01:14:21] -!- andypugh has quit [Quit: andypugh]
[01:18:02] <ctjctj> cradek: per your suggestion I rewrote that part of the patch and it is *much* faster now. I've got one add and one bug fix in the following:
http://pastebin.ca/2168676 the 2nd commit regarding /n/r to /r/n and removing excess end-of-lines I believe to be a bug fix.
[01:34:18] -!- i_tarzan_ has quit [Ping timeout: 264 seconds]
[01:52:34] -!- syyl__ has quit [Quit: Leaving]
[02:22:57] -!- gmagno has quit [Read error: Connection reset by peer]
[02:35:21] -!- chron0 has quit [Ping timeout: 272 seconds]
[02:35:28] <KimK_> cradek: Ha, yes, I started on the junior last August, took it apart and worked on it for maybe 2-3 weeks and then had to set it aside. and I haven't been back to the pieces since. Maybe soon, though?
[02:45:12] -!- ctjctj [ctjctj!~cjohnson@c-24-62-5-242.hsd1.nh.comcast.net] has parted #linuxcnc-devel
[02:47:13] -!- Jbunch has quit [Ping timeout: 245 seconds]
[03:06:42] -!- i_tarzan has quit [Ping timeout: 264 seconds]
[03:16:37] -!- WalterN has quit [Ping timeout: 240 seconds]
[03:38:04] -!- nlkdavid has quit [Quit: Bye Bye]
[03:41:07] -!- skunkworks__ has quit [Read error: Operation timed out]
[03:47:01] -!- sumpfralle1 has quit [Ping timeout: 244 seconds]
[03:49:34] -!- LeelooMinai has quit [Remote host closed the connection]
[03:50:54] -!- r00t-Shed has quit [Ping timeout: 246 seconds]
[04:21:50] -!- ve7it has quit [Remote host closed the connection]
[04:31:18] -!- mhaberler [mhaberler!~mhaberler@193.228.47.147] has joined #linuxcnc-devel
[04:37:26] -!- i_tarzan has quit [Ping timeout: 246 seconds]
[04:56:46] -!- i_tarzan has quit [Ping timeout: 265 seconds]
[05:02:33] -!- i_tarzan_ has quit [Read error: Operation timed out]
[05:04:31] -!- Fox_Muldr has quit [Ping timeout: 265 seconds]
[05:17:30] -!- X704 has quit [Ping timeout: 264 seconds]
[05:25:16] -!- i_tarzan has quit [Ping timeout: 252 seconds]
[05:48:03] -!- i_tarzan has quit [Read error: Operation timed out]
[06:02:02] -!- i_tarzan has quit [Ping timeout: 265 seconds]
[06:05:07] -!- A2Sheds has quit [Ping timeout: 246 seconds]
[06:21:02] -!- linux-cnc-bob has quit [Quit: ChatZilla 0.9.88.2 [Firefox 11.0/20120310193829]]
[06:23:48] -!- i_tarzan_ has quit [Ping timeout: 248 seconds]
[06:40:07] -!- i_tarzan has quit [Ping timeout: 240 seconds]
[06:42:09] -!- WiillenCMdesign has quit [Ping timeout: 265 seconds]
[06:57:18] -!- jpk has quit [Ping timeout: 252 seconds]
[08:04:47] -!- DJ9DJ has quit [Quit: brb]
[08:41:31] -!- i_tarzan has quit [Ping timeout: 244 seconds]
[08:52:56] -!- rob_h [rob_h!~rob_h@5e046fc1.bb.sky.com] has joined #linuxcnc-devel
[08:53:05] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[09:07:10] cylly2 is now known as Loetmichel
[09:31:54] -!- Keknom has quit [Client Quit]
[09:33:23] -!- DJ9DJ has quit [Read error: Connection reset by peer]
[09:35:11] -!- Tom_itx has quit [Ping timeout: 265 seconds]
[09:52:12] -!- djinni` has quit [Quit: ERC Version 5.3 (IRC client for Emacs)]
[09:52:12] -!- mal`` has quit [Quit: ERC Version 5.3 (IRC client for Emacs)]
[09:56:28] -!- mal`` [mal``!~mal``@li125-242.members.linode.com] has joined #linuxcnc-devel
[09:57:32] -!- BenceKovi118 [BenceKovi118!~BenceKovi@polaris.mogi.bme.hu] has joined #linuxcnc-devel
[10:02:11] -!- BenceKovi119 [BenceKovi119!~BenceKovi@polaris.mogi.bme.hu] has joined #linuxcnc-devel
[10:03:02] -!- BenceKovi118 has quit [Read error: Connection reset by peer]
[10:49:22] -!- jthornton has quit [Read error: Connection timed out]
[10:50:39] -!- jthornton [jthornton!~john@184.20.140.167] has joined #linuxcnc-devel
[11:01:03] -!- morfic has quit [Read error: Connection reset by peer]
[11:03:08] -!- andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust639.basl.cable.virginmedia.com] has joined #linuxcnc-devel
[11:12:20] -!- i_tarzan has quit [Ping timeout: 248 seconds]
[11:18:00] -!- WalterN has quit [Ping timeout: 252 seconds]
[11:35:09] -!- shurshur has quit [Quit: restart]
[12:08:03] -!- yangchang has quit [Quit: Leaving]
[12:30:34] -!- mhaberler has quit [Quit: mhaberler]
[12:31:16] -!- r00t-Shed has quit [Ping timeout: 248 seconds]
[13:08:12] -!- tlab has quit [Quit: Leaving]
[13:12:12] -!- syyl has quit [Quit: Leaving]
[13:16:20] Tom_L is now known as Tom_itx
[13:40:21] -!- DJ9DJ has quit [Quit: brb]
[14:00:57] -!- skunkworks__ [skunkworks__!~chatzilla@str-bb-cable-south-3-102.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[14:12:40] -!- DJ9DJ has quit [Quit: brb]
[14:26:23] -!- dimas has quit [Ping timeout: 245 seconds]
[14:30:02] -!- mozmck [mozmck!~moses@client-74.117.92.175.dfwtx.partnershipbroadband.com] has joined #linuxcnc-devel
[15:05:31] -!- karavanjo has quit [Read error: Connection reset by peer]
[15:07:15] -!- djdelorie has quit [Quit: Leaving]
[15:18:19] -!- WalterN has quit [Ping timeout: 244 seconds]
[15:49:30] -!- joe9 [joe9!~joe9@c-24-126-150-243.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[15:49:54] -!- andypugh has quit [Ping timeout: 264 seconds]
[16:28:33] -!- Tom_L has quit []
[16:49:53] -!- taiden has quit [Read error: Connection reset by peer]
[17:23:52] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[17:31:16] -!- gmagno has quit [Ping timeout: 252 seconds]
[17:45:26] -!- BenceKovi119 has quit [Read error: Connection reset by peer]
[17:46:17] -!- BenceKovi119 [BenceKovi119!~BenceKovi@polaris.mogi.bme.hu] has joined #linuxcnc-devel
[17:47:30] -!- Jbunch has quit [Ping timeout: 264 seconds]
[17:58:56] -!- micges [micges!~micges@egp210.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[18:01:42] -!- joe9 has quit [Quit: Lost terminal]
[18:07:35] -!- joe9 [joe9!~joe9@c-24-126-150-243.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[18:16:18] -!- gmagno has quit [Ping timeout: 250 seconds]
[18:16:58] -!- andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust639.basl.cable.virginmedia.com] has joined #linuxcnc-devel
[18:31:04] -!- sumpfralle has quit [Quit: Leaving.]
[18:59:10] -!- joe9 has quit [Quit: leaving]
[19:03:35] -!- sumpfralle1 has quit [Ping timeout: 265 seconds]
[19:03:55] -!- ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #linuxcnc-devel
[19:09:24] -!- vladimirek has quit [Remote host closed the connection]
[19:15:39] -!- joe9 [joe9!~joe9@c-24-126-150-243.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[19:15:50] -!- joe9 has quit [Client Quit]
[19:23:54] -!- BenceKovi119 has quit [Quit: Nettalk6 - www.ntalk.de]
[19:26:28] -!- toastyde1th has quit [Read error: Connection timed out]
[19:44:42] -!- phantoxeD has quit [Ping timeout: 250 seconds]
[19:52:59] -!- DJ9DJ has quit [Quit: brb]
[20:10:02] -!- mhaberler has quit [Ping timeout: 252 seconds]
[20:11:42] -!- bedah has quit [Quit: bye]
[20:13:24] -!- karavanjo has quit [Quit: Leaving]
[20:18:44] -!- toastyde1th has quit [Read error: Connection timed out]
[20:28:57] -!- DJ9DJ has quit [Quit: brb]
[20:32:55] -!- mhaberler [mhaberler!~mhaberler@193.228.47.147] has joined #linuxcnc-devel
[20:33:03] -!- mhaberler_ [mhaberler_!~mhaberler@extern-184.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:33:59] -!- mhaberler_ has quit [Remote host closed the connection]
[20:34:11] -!- mhaberler_ [mhaberler_!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:34:51] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[20:35:56] -!- mhaberler has quit [Read error: Connection reset by peer]
[20:35:57] -!- mhaberler_ has quit [Read error: Connection reset by peer]
[20:36:01] -!- mhaberler___ [mhaberler___!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:39:46] -!- _abc_ has quit [Ping timeout: 265 seconds]
[20:41:53] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:42:07] -!- mhaberler___ has quit [Ping timeout: 240 seconds]
[21:05:01] -!- mhaberler has quit [Quit: mhaberler]
[21:05:31] -!- mozmck has quit [Ping timeout: 244 seconds]
[21:16:33] -!- maximilian_h [maximilian_h!~bonsai@130.255.104.21] has joined #linuxcnc-devel
[21:16:34] -!- maximilian_h [maximilian_h!~bonsai@130.255.104.21] has parted #linuxcnc-devel
[21:29:42] -!- Gast558 has quit [Quit: Bye Bye]
[21:31:13] -!- JT-Shop [JT-Shop!~john@184.20.140.167] has joined #linuxcnc-devel
[21:33:04] -!- chillly has quit [Quit: Leaving]
[21:39:12] -!- Jbunch has quit [Ping timeout: 265 seconds]
[21:39:24] -!- mozmck [mozmck!~moses@client-74.117.92.175.dfwtx.partnershipbroadband.com] has joined #linuxcnc-devel
[21:41:53] -!- r00t-Shed has quit [Read error: Operation timed out]
[21:46:06] -!- Loetmichel has quit [Ping timeout: 252 seconds]
[21:55:31] -!- micges has quit [Quit: Leaving]
[22:10:21] -!- DJ9DJ has quit [Quit: bye]
[22:20:19] -!- mhaberler [mhaberler!~mhaberler@193.228.47.147] has joined #linuxcnc-devel
[22:41:10] -!- Mick_ has quit [Quit: Page closed]
[22:42:29] -!- jieter has quit [Remote host closed the connection]
[22:50:12] -!- elmo40 has quit [Quit: Leaving.]
[23:05:59] -!- kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[23:28:53] -!- Thetawaves has quit [Quit: This computer has gone to sleep]
[23:29:13] -!- sumpfralle has quit [Read error: Operation timed out]
[23:32:36] -!- Roguish has quit [Remote host closed the connection]
[23:34:19] -!- Keknom has quit [Quit: Leaving.]
[23:35:39] -!- i_tarzan has quit [Read error: Operation timed out]
[23:38:39] -!- gmagno has quit [Ping timeout: 245 seconds]
[23:39:43] -!- rob_h has quit [Ping timeout: 245 seconds]
[23:50:41] -!- factor has quit [Ping timeout: 265 seconds]