Back
[00:04:11] -!-
theorbtwo has quit [Ping timeout: 240 seconds]
[00:04:28] theorb is now known as
theorbtwo
[00:07:48] -!-
Valen has quit [Excess Flood]
[00:17:41] -!-
mhaberler has quit [Quit: mhaberler]
[00:38:15] -!-
andypugh has quit [Quit: andypugh]
[01:20:26] -!-
tom3p has quit [Quit: Ex-Chat]
[01:23:58] -!-
mikegg has quit [Remote host closed the connection]
[01:24:35] -!-
rooks has quit [Remote host closed the connection]
[01:36:46] -!-
uwe_ has quit [Ping timeout: 250 seconds]
[02:36:11] -!-
sumpfralle1 has quit [Ping timeout: 240 seconds]
[02:37:22] -!-
theos has quit [Disconnected by services]
[02:44:52] -!-
kljsdfhklj has quit [Quit: kljsdfhklj]
[02:47:02] -!-
kljsdfhklj has quit [Client Quit]
[02:50:52] -!-
theos has quit [Disconnected by services]
[02:51:21] -!-
ries has quit [Quit: ries]
[03:04:42] Tech_Talk is now known as
Birdman3131
[03:12:48] -!-
Technicus has quit [Quit: Leaving.]
[03:29:24] -!-
uwe_ has quit [Ping timeout: 258 seconds]
[04:36:43] -!-
Eartaker has quit [Quit: Not again...]
[05:29:58] -!-
vladimirek [
[email protected]] has joined #emc-devel
[05:50:02] -!-
mhaberler [
[email protected]] has joined #emc-devel
[06:24:00] -!-
ve7it has quit [Remote host closed the connection]
[06:44:25] -!-
factor has quit [Read error: Connection reset by peer]
[06:56:05] -!-
cpresser has quit [Ping timeout: 260 seconds]
[07:06:04] -!-
FinboySlick has quit [Quit: Leaving.]
[07:13:39] -!-
capricorn_one has quit [Remote host closed the connection]
[07:36:03] -!-
mhaberler has quit [Quit: mhaberler]
[07:36:41] -!-
mhaberler [
[email protected]] has joined #emc-devel
[07:38:05] -!-
mhaberler has quit [Client Quit]
[07:58:57] -!-
awallin_ [awallin_!~quassel@2001:708:110:1020:224:7eff:feda:7c7d] has joined #emc-devel
[08:00:47] -!-
adb [
[email protected]] has joined #emc-devel
[08:04:42] -!-
cjdavis has quit [Ping timeout: 255 seconds]
[08:14:04] -!-
e-ndy [e-ndy!~jkastner@nat/redhat/x-enwnnlzxnydjrjni] has joined #emc-devel
[08:26:42] -!-
Danimal_garage has quit [Read error: Connection reset by peer]
[09:01:19] -!-
mhaberler [
[email protected]] has joined #emc-devel
[09:01:56] -!-
mhaberler has quit [Client Quit]
[09:02:13] -!-
mhaberler [
[email protected]] has joined #emc-devel
[09:08:06] -!-
canid has quit [Quit: spiders! spiders!]
[09:34:44] -!-
Martyns has quit [Quit: Colloquy for iPad -
http://colloquy.mobi]
[10:41:04] -!-
nicko has quit [Ping timeout: 250 seconds]
[11:03:48] -!-
Birdman3131 has quit [Ping timeout: 255 seconds]
[11:29:32] -!-
sumpfralle has quit [Read error: Connection reset by peer]
[11:46:11] -!-
Loetmichel has quit [Ping timeout: 260 seconds]
[12:02:56] -!-
vladimirek has quit [Remote host closed the connection]
[12:06:12] -!-
hatch789 has quit [Client Quit]
[12:36:42] -!-
sumpfralle1 has quit [Ping timeout: 276 seconds]
[12:48:41] -!-
sumpfralle has quit [Ping timeout: 258 seconds]
[13:22:15] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[13:22:42] -!-
JT-Shop has quit [Client Quit]
[13:23:14] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[13:23:22] -!-
JT-Shop has quit [Client Quit]
[13:23:41] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[14:05:08] -!-
sumpfralle1 has quit [Ping timeout: 240 seconds]
[14:51:26] -!-
Valen has quit [Quit: Leaving.]
[14:53:52] -!-
awallin_ has quit [Remote host closed the connection]
[15:11:24] -!-
toastydeath has quit [Ping timeout: 276 seconds]
[15:20:26] -!-
sumpfralle has quit [Read error: Operation timed out]
[15:26:41] -!-
pjm has quit [Ping timeout: 260 seconds]
[15:37:37] -!-
theos has quit [Disconnected by services]
[16:04:14] -!-
e-ndy has quit [Quit: Ex-Chat]
[16:04:44] -!-
ve7it [
[email protected]] has joined #emc-devel
[16:09:58] <mhaberler> jepler: yes, it should go into 2.5_branch as well - I'm working on the rollforward merge conflicts (lots due to documentation work)
[16:10:46] <cradek> you are trying to merge what into what?
[16:12:36] <mhaberler> v2.5_branch into master
[16:13:28] <mhaberler> I'd revert the commit in master, apply in v2.5_branch, then merge v2.5_branch into master
[16:13:39] <cradek> how does that keep getting so screwed up? I deciphered that same merge recently.
[16:14:02] <cradek> I see very little reason why people would change doc stuff directly in master right now
[16:14:28] <cradek> don't bother reverting, just cherry pick the commit onto master
[16:14:44] <cradek> merge will notice it's on both branches already, and not do anything
[16:14:57] <mhaberler> ah
[16:15:16] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[16:15:35] <mhaberler> but I'd had to cherrypick onto v2.5_branch as its in master; same thing though (hopefully)
[16:17:25] <cradek> oops that's what I meant to say
[16:18:38] <CIA-11> EMC: 03mhaberler 07v2.5_branch * rda9fe5bcedba 10/src/emc/rs274ngc/gcodemodule.cc: gcodemodule/rs274_calc_extents: remove erroneous parameter
[16:18:58] <cradek> 2.4 doesn't merge into 2.5 either
[16:24:36] <mhaberler> looks like our author jumped branches mid-flight
[16:25:32] <cradek> tell me more? I can't figure it out.
[16:29:15] <mhaberler> that is strange - the merge conflicts are due to code not committed yet
[16:30:39] <mhaberler> oops, I was loooking at the merge conflict proper, which aint committed by definition :-/
[16:33:10] -!-
Calyp has quit [Ping timeout: 264 seconds]
[16:38:57] <cradek> I have a 2.4->2.5 merge fixed up
[16:39:29] <mhaberler> I'd still like to understand why this happens..
[16:40:30] <cradek> 2.4->2.5 conflict is because cmorley made incompatible changes in stepconf/pncconf in 2.4 and 2.5. I was able to find them this time.
[16:40:59] <cradek> 2.5->master is probably more of the same, but there's been a lot more activity so tracking it down is harder.
[16:43:00] <CIA-11> EMC: 03cradek 07v2.5_branch * r4fc44603ed8e 10/src/emc/usr_intf/stepconf/stepconf.py: stepconf - fix scaling of spindle speed display
[16:43:00] <CIA-11> EMC: 03cradek 07v2.5_branch * rf8ea6639ec10 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -fix scaling of spindle speed display
[16:54:15] -!-
canid has quit [Quit: spiders! stealing system resource hamsters!]
[17:03:51] -!-
JT-Shop has quit [Quit: ChatZilla 0.9.87 [Firefox 5.0.1/20110707182747]]
[17:04:11] <mhaberler> re conflict resolution: I found this article very useful:
http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html
[17:18:45] -!-
e-ndy [
[email protected]] has joined #emc-devel
[17:25:55] <mhaberler> I'll look into the v2.5_branch -> master merge lateron, but I need to understand this a bit better first
[17:32:21] -!-
skunkworks_ [skunkworks_!~chatzilla@str-bb-cable-south2-static-6-78.dsl.airstreamcomm.net] has joined #emc-devel
[17:35:37] -!-
kbarry has quit [Read error: Connection reset by peer]
[17:38:06] -!-
Zencncbuild has quit [Ping timeout: 258 seconds]
[17:48:43] -!-
stormlight has quit [Read error: Connection reset by peer]
[18:08:03] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[18:13:51] -!-
mhaberler has quit [Quit: mhaberler]
[18:18:03] -!-
Birdman3131 has quit [Ping timeout: 255 seconds]
[18:20:25] -!-
mhaberler [
[email protected]] has joined #emc-devel
[18:21:09] -!-
Connor has quit [Quit: Leaving.]
[18:31:32] -!-
WalterN has quit [Quit: Leaving]
[18:33:07] -!-
i_tarzan has quit [Ping timeout: 252 seconds]
[18:50:23] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[18:55:14] -!-
esden has quit [Ping timeout: 246 seconds]
[19:05:36] -!-
nullie has quit [Quit: Ex-Chat]
[19:17:25] <cradek> mhaberler: I have a successful merge of 2.5->master and build. should I push it?
[19:17:57] <mhaberler> how did you decide which doc version is the better one.. my asciidoc aint good enough
[19:18:12] <mhaberler> yes, I mean we can always back it out
[19:18:19] <cradek> for everything but two files it was obvious
[19:18:28] <cradek> for two files, I just took the 2.5 version
[19:20:27] <cradek> people MUST stop changing docs on master when the change is also relevant for 2.5
[19:20:49] <cradek> it makes an unholy mess
[19:20:56] <mhaberler> you're tooting my horn.. this project needs some clear directives
[19:21:07] -!-
e-ndy has quit [Quit: Ex-Chat]
[19:21:49] <cradek> sorry but upon further inspection, I think it is you who keeps doing it?
[19:22:10] <cradek> d0c58a233
[19:22:12] <cradek> 9dc869a03a
[19:22:52] <mhaberler> I flat out didnt know.
[19:23:02] <cradek> ah ok
[19:23:30] <mhaberler> I mean I'm happy to take directions, provided I find'em
[19:23:53] <cradek> we use "Merging upwards" (see man gitworkflows)
[19:24:29] <mhaberler> sure, I understood that a while ago, but that didnt ring the bell were docs work would need to go
[19:24:45] <cradek> +|L | generic parameter word for G10, M66 and others
[19:25:05] <cradek> like this change. it applies to 2.5 and newer, so it goes on 2.5
[19:26:49] <cradek> it was a conflict because someone changed nearby whitespace in 2.5 branch
[19:28:41] <cradek> do you have questions for me? I'm not sure what else to say except what it says in "Merging upwards"
[19:29:13] <cradek> brb, pie
[19:33:34] -!-
isssy has quit [Client Quit]
[19:40:57] -!-
uwe_ has quit [Ping timeout: 276 seconds]
[19:45:15] -!-
kljsdfhklj has quit [Ping timeout: 240 seconds]
[20:03:54] -!-
isssy has quit [Client Quit]
[20:08:16] -!-
nullie has quit [Quit: Ex-Chat]
[20:09:32] -!-
jbunch has quit [Read error: Connection reset by peer]
[20:11:10] -!-
chester88 has quit [Ping timeout: 260 seconds]
[20:27:11] -!-
stormlight has quit [Read error: Connection reset by peer]
[20:27:12] stormlight_ is now known as
stormlight
[20:32:57] -!-
toastyde1th has quit [Ping timeout: 276 seconds]
[20:38:11] -!-
izua has quit [Quit: leaving]
[20:39:04] -!-
izua has quit [Changing host]
[20:48:23] -!-
mhaberler has quit [Quit: mhaberler]
[21:01:55] <CIA-11> EMC: 03seb 07v2.5_branch * r5ee338b217f7 10/debian/control.in: packaging: build-depend on the Hardy debhelper or newer
[21:09:25] -!-
e3m has quit [Quit: I used to think I was indecisive, but now I'm not too sure.]
[21:17:42] <CIA-11> EMC: 03seb 07v2.5_branch * r3748da4c5060 10/debian/source/format: packaging: note source format version
[21:22:23] -!-
FinboySlick has quit [Quit: Leaving.]
[21:42:42] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust1037.basl.cable.virginmedia.com] has joined #emc-devel
[21:50:09] -!-
isssy has quit [Client Quit]
[21:52:32] -!-
chester88 [
[email protected]] has joined #emc-devel
[21:58:12] -!-
mhaberler [
[email protected]] has joined #emc-devel
[22:00:12] -!-
factor has quit [Read error: Connection reset by peer]
[22:15:39] -!-
kljsdfhklj has quit [Ping timeout: 255 seconds]
[22:15:39] kljsdfhklj_ is now known as
kljsdfhklj
[22:17:22] -!-
robh__ [
[email protected]] has joined #emc-devel
[22:17:44] -!-
JT-Shop_ [
[email protected]] has joined #emc-devel
[22:19:10] -!-
JT-Shop has quit [Ping timeout: 250 seconds]
[22:21:07] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[22:22:07] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[22:23:14] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[22:23:14] -!-
JT-Shop_ has quit [Ping timeout: 240 seconds]
[22:29:48] -!-
JT-Shop has quit [Ping timeout: 240 seconds]
[22:30:32] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[22:31:58] -!-
robh__ has quit [Read error: Connection reset by peer]
[22:32:23] -!-
robh__ [
[email protected]] has joined #emc-devel
[22:33:27] <CIA-11> EMC: 03seb 07v2.5_branch * r7e8dbfd6f0c9 10/debian/update-dch-from-git: packaging: use valid debian version number format
[22:40:19] -!-
stormlight has quit [Read error: Connection reset by peer]
[22:42:03] -!-
mhaberler has quit [Quit: mhaberler]
[22:43:54] -!-
awallin has quit [Read error: Operation timed out]
[22:45:29] -!-
Danimal_garage has quit [Read error: Connection reset by peer]
[22:47:17] -!-
Calyp has quit [Quit: Leaving]
[22:49:19] -!-
El_Matarife has quit [Quit: Nettalk6 - www.ntalk.de]
[22:53:06] -!-
syyl has quit [Quit: Leaving]
[23:03:48] -!-
Birdman3131 has quit [Ping timeout: 255 seconds]
[23:14:46] -!-
stormlight has quit [Quit: stormlight]
[23:16:38] -!-
Danimal_garage has quit [Read error: Connection reset by peer]
[23:17:53] -!-
andypugh has quit [Quit: andypugh]
[23:19:22] -!-
Danimal_garage has quit [Read error: Connection reset by peer]
[23:24:20] -!-
kbarry has quit [Remote host closed the connection]
[23:43:25] -!-
morfic has quit [Read error: Connection reset by peer]
[23:51:31] -!-
kbarry has quit [Remote host closed the connection]
[23:53:21] -!-
The_Ball has quit [Ping timeout: 276 seconds]
[23:58:56] -!-
atom1 has quit [Quit: Leaving]