Back
[01:06:24] <CIA-2> EMC: 03jepler 07v2.4_branch * r9c59cf5a5bfe 10/src/emc/task/emctaskmain.cc: make "step from start" run+pause, not run+step+pause
[20:55:57] <andypugh> I have a patch file that adds support for the 3-phase PWMs and onboard LEDs to the Hostmot2 driver. What should I do with it next?
[20:57:29] <SWPadnos> a few options:
[20:57:38] <SWPadnos> 1) email it to seb
[20:58:09] <SWPadnos> 2) email it to the devel list (if it's not too big) or stick it on the wiki, so others can look at it
[20:58:23] <SWPadnos> 3) make a branch for it in git
[20:58:28] <SWPadnos> and push to the main repo
[20:59:04] <jepler> andypugh doesn't have push access so that option's no good
[20:59:06] <andypugh> I asked Seb if he would look at it, but have had no reply. Does anyone know if he is around?
[20:59:12] <jepler> I haven't seen seb around much
[20:59:16] <SWPadnos> don't know
[20:59:32] <micges> he's quite busy
[21:00:18] <jepler> I'd create a commit with git commit (or in git gui), then use git format-patch to make a file with the patch, then send it to the mailing list (as an attachment if I didn't trust my mail program to handle patches inline)
[21:02:25] <jepler> (and congrats for getting it working!)
[21:04:49] <andypugh> Should I split it into two patches? One for LEDs and one for 3P-PWMs?
[21:05:11] <micges> yes
[21:05:33] <andypugh> I thought you might say that.
[21:05:43] <andypugh> (Hmm, I wonder how?)
[21:06:10] <jepler> "git gui" can help by staging individual lines or chunks
[21:06:23] <jepler> if you already made a commit with everything in it, then you can use the "amend commit" button by the place where you type the change message
[21:07:45] <aystarik> stgit might be handy too
[21:09:34] <andypugh> I don't think what I did counts as making a commit, I just copied the entire source tree of my working installation, and then started fiddling.
[21:14:58] <jepler> if you didn't "git commit" or use the git gui "commit" button then you almost certainly didn't create a commit
[21:16:12] <andypugh> Well, at that point I didn't really expect to get anywhere, so I was just messing around and looking at the source.
[21:17:24] <andypugh> A month ago I had never even programmed in C, git is yet another mystery.
[21:17:49] <jepler> that's the minus side. on the plus side, it sounds like you pick up new things pretty quickly.
[21:19:57] <jepler> are the changes you made inside a git clone of emc2, or are they in a copy of the source that is not a git clone?
[21:19:59] <andypugh> It looks like git gui just remastered my devel directory. Does it make sense to hand-edit the patch file I have into two seperate ones then patch two branches?
[21:20:16] <jepler> remastered?
[21:21:08] <andypugh> It looks like my emc-dev directory is now 2.5~pre when it was 2.4~pre
[21:22:50] <andypugh> (Not a problem, I was going to do that anyway soon).
[21:23:25] <andypugh> Looking in the copy that I made and did the changes in, it looks like Git has already spotted the changed files.
[21:23:41] <jepler> for the short term if you want to just send the patch with both things to the list that would be fine
[21:24:19] <andypugh> I think that will be easier from where we are now.
[21:24:21] <jepler> but for the future you may find it useful to learn how to use some more of git -- for instance, until you've commited your changes, you can't "git pull" to get changes from other developers..
[21:25:47] <jepler> (a git commit sent with git format-patch has advantages over a plain patch, like it will automatically track that *you* wrote that code no matter who who actually puts the commit in the official version)
[21:25:58] <jepler> bbl, heading home from work