Back
[16:25:53] <KGB-linuxcnc> 03Chris Morley 052.6 3a5a030 06linuxcnc 10src/emc/usr_intf/pncconf/pncconf.py pncconf -fix double POSITION_OFFSET/FEEBACk INI entry * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=3a5a030
[16:25:53] <KGB-linuxcnc> 03Chris Morley 052.6 62e219e 06linuxcnc 10src/emc/usr_intf/pncconf/pncconf.py pncconf -lower default watchdog limit * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=62e219e
[16:26:35] <KGB-linuxcnc> 03Chris Morley 052.7 405b398 06linuxcnc Merge branch '2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=405b398
[16:30:51] <KGB-linuxcnc> 03Chris Morley 052.7 a1e6d39 06linuxcnc 10src/emc/usr_intf/pncconf/pncconf.py pncconf -lower watchdog limit * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=a1e6d39
[16:30:51] <KGB-linuxcnc> 03Chris Morley 052.7 e650ddc 06linuxcnc 10src/emc/usr_intf/pncconf/build_INI.py pncconf -fix double POSITION_FEEDBACK/OFFSET INI entry * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=e650ddc
[17:23:45] <seb_kuzminsky> thanks cmorley!
[17:25:37] <seb_kuzminsky> what happened with the merge? normally the commits would go into 2.6, then get merged into 2.7, but i see that you made the commits in 2.7 too
[17:36:15] <memfrob> git merge merges history, looks like a double commit when it's not
[17:37:08] <memfrob> if you look at my merge from jepler's tree in the github.com/ntulinux/rtai history, i think there was 2 or 3 duplicates in the history somehow, it happens.
[17:37:59] <seb_kuzminsky> no, git merge makes a new commit with two parents instead of the usual one
[17:38:15] <seb_kuzminsky> a commit should appear in exactly one leg of the history
[17:39:07] <memfrob> it must depend on how your git client is set up then.. for me i get multiple commits
[17:39:27] <cradek> github makes extra merge commits for some inscrutable reason
[17:39:35] <memfrob> ah!
[17:39:47] <cradek> if you're used to github I can see how you would think this
[17:39:59] <memfrob> yeah that explains it
[17:40:06] <cradek> where "inscrutable" means "cradek doesn't understand it at first glance" haha
[17:41:29] <seb_kuzminsky> i think we're talking about different things
[17:41:51] <seb_kuzminsky> in memfrob's rtai repo there are merge commits that could have been fast-forwarded, github does that on purpose to track when PRs get merged
[17:42:06] <memfrob> ohh!
[17:42:27] <seb_kuzminsky> in our 2.7 branch there is a merge of our 2.6 branch that includes a couple of fixes to pncconf, followed by a couple of commits in 2.7 that re-produce the fixes
[17:43:06] <seb_kuzminsky> i'm talking about the commits on 2.7 that should have already been included in 2.7 by the preceeding merge commit
[17:43:08] <cradek> seb_kuzminsky: look again - I think they're different files
[17:43:14] <seb_kuzminsky> whaa
[17:43:25] <cradek> wait, one is
[17:43:39] <seb_kuzminsky> yeah one is
[17:43:42] <seb_kuzminsky> one aint
[17:43:58] <seb_kuzminsky> i think that should have been handled by a patch in the merge commit
[17:44:08] <seb_kuzminsky> but it's really no big deal
[17:44:39] <cradek> I don't understand how the duplicated one works
[17:44:58] <cradek> they're at very different spots in the file
[17:46:18] <seb_kuzminsky> pncconf got refactored in 2.7
[17:46:35] <seb_kuzminsky> i think i'll go play in the garage for a bit
[17:46:41] <cradek> ok got it, this is just a result of that
[17:46:46] <seb_kuzminsky> i'll do it with 2.7~pre so it counts as work :-)
[17:46:56] <cradek> ha
[18:45:14] <linuxcnc-build_> build #2277 of 2000.docs is complete: Failure [4failed git] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/2000.docs/builds/2277 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[18:53:35] <linuxcnc-build_> build #2807 of 0000.checkin is complete: Failure [4failed] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/2807 blamelist: Chris Morley <chrisinnanaimo@hotmail.com>
[19:16:21] <seb_kuzminsky> that's another of those annoying git auto-gc bugs :-(
[19:16:57] <seb_kuzminsky> linuxcnc-build_: force build --branch=2.7 0000.checkin
[19:16:59] <linuxcnc-build_> build forced [ETA 1h10m29s]
[19:16:59] <linuxcnc-build_> I'll give a shout when the build finishes
[19:19:58] <cmorley> yes pncconf is refactored in 2.7 so it was easier to ignore the 2.6 commits and add new ones (cause they are in different files.
[19:56:43] <seb_kuzminsky> cmorley: ok that makes sense
[19:57:38] <cmorley> as you said i guess I could have done it in the merge commit - not sure it maters - which would you prefer?
[20:08:54] <seb_kuzminsky> i prefer whichever way is easier for you ;-)
[20:12:06] <seb_kuzminsky> because of the refactoring, possibly separate commits are easier to understand
[20:40:49] <linuxcnc-build_> Hey! build 0000.checkin #2808 is complete: Success [3build successful]
[20:40:49] <linuxcnc-build_> Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/2808