Back
[00:06:33] -!-
Fox_Muldr has quit [Ping timeout: 260 seconds]
[00:09:59] -!-
mhaberler [
[email protected]] has joined #emc-devel
[00:18:30] -!-
Loetmichel has quit [Ping timeout: 260 seconds]
[00:26:23] -!-
theorbtwo has quit [Ping timeout: 248 seconds]
[00:26:32] theorb is now known as
theorbtwo
[00:37:10] -!-
theorbtwo has quit [Ping timeout: 260 seconds]
[00:37:23] theorb is now known as
theorbtwo
[00:51:27] -!-
skunkKandT has quit [Remote host closed the connection]
[00:54:20] -!-
ries has quit [Quit: ries]
[01:10:13] -!-
mhaberler has quit [Quit: mhaberler]
[01:11:01] -!-
crazy_imp has quit [Ping timeout: 255 seconds]
[01:22:49] -!-
syyl has quit [Quit: Verlassend]
[01:39:30] -!-
andypugh has quit [Quit: andypugh]
[02:02:01] -!-
robh__ has quit [Ping timeout: 256 seconds]
[02:10:45] -!-
syyl_ has quit [Quit: Leaving]
[03:07:12] -!-
stormlight has quit [Quit: stormlight]
[03:15:48] -!-
Quack has quit [Ping timeout: 240 seconds]
[03:40:43] -!-
FinboySlick has quit [Quit: Leaving.]
[03:58:34] -!-
Connor has quit [Read error: Connection reset by peer]
[04:06:04] -!-
emc_rules has quit [Ping timeout: 255 seconds]
[04:09:00] -!-
Quack has quit [Ping timeout: 240 seconds]
[04:14:33] -!-
Guest77789 has quit [Ping timeout: 245 seconds]
[04:23:37] <CIA-95> EMC: 03cradek 07master * re517b06590da 10/docs/src/common/ (Glossary.txt Glossary_de.txt Glossary_es.txt Glossary_fr.txt): Docs: Minor fixes to Glossary (4-lang)
[04:23:38] <CIA-95> EMC: 03cradek 07master * r5f8ec71255ef 10/docs/src/common/ (4 files): Docs: Minor fixes to Glossary (4-lang)
[04:23:39] <CIA-95> EMC: 03cradek 07master * rc8ec8a13ce5f 10/docs/src/examples/ (4 files): Docs: Minor fixes to Glossary (4-lang)
[04:23:40] <CIA-95> EMC: 03cradek 07master * r0dd5c141bfad 10/docs/src/config/ini_config_fr.txt: Docs: Minor fixes to Glossary (4-lang)
[04:23:42] <CIA-95> EMC: 03cradek 07master * r1407f25b33bb 10/docs/src/config/pncconf.txt: Docs: Minor fixes to Glossary (4-lang)
[04:23:42] <CIA-95> EMC: 03cradek 07master * rf468db12f3e5 10/docs/src/gcode/ (main.txt main_de.txt main_es.txt main_fr.txt): Docs: Minor fixes to Glossary (4-lang)
[04:23:43] <CIA-95> EMC: 03cradek 07master * ra325051c3c61 10/docs/src/gcode/ (overview.txt overview_de.txt overview_es.txt overview_fr.txt): Docs: Minor fixes to Overview (4-lang)
[04:23:44] <CIA-95> EMC: 03cradek 07master * r9bb983a537a4 10/docs/src/gcode/ (4 files): Docs: Minor fixes to tool_compensation (4-lang)
[04:23:45] <CIA-95> EMC: 03cradek 07master * r81ed621054a5 10/docs/src/gui/ (axis.txt axis_de.txt axis_es.txt axis_fr.txt): Docs: Minor fixes to Axis (4-lang)
[04:23:45] <CIA-95> EMC: 03cradek 07master * r3f2b3e030424 10/docs/src/gui/ (halui.txt halui_de.txt halui_es.txt halui_fr.txt): Docs: Minor fixes to halui (4-lang)
[04:23:47] <CIA-95> EMC: 03cradek 07master * r8a3b8f7d8d7e 10/docs/src/hal/ (4 files): Docs: Minor fixes to basic_hal (4-lang)
[04:23:48] <CIA-95> EMC: 03cradek 07master * r07416766e6ac 10/docs/src/hal/ (comp.txt comp_de.txt comp_es.txt comp_fr.txt): Docs: Minor fixes to comp (4-lang)
[04:23:48] <CIA-95> EMC: 03cradek 07master * ra4faa411ef53 10/docs/src/hal/ (4 files): Docs: Minor fixes to parallel_port (4-lang)
[04:23:49] <CIA-95> EMC: 03cradek 07master * rb339c0c6e855 10/docs/src/hal/ (pyvcp.txt pyvcp_de.txt pyvcp_es.txt pyvcp_fr.txt): Docs: Minor fixes to pyvcp (4-lang)
[04:23:50] <CIA-95> EMC: 03cradek 07master * rdbaaac4300fd 10/docs/src/hal/ (4 files): Docs: Minor fixes to pyvcp_examples (4-lang)
[04:23:51] <CIA-95> EMC: 03cradek 07master * r0c44fbc2ffaa 10/docs/src/hal/ (tools.txt tools_de.txt tools_es.txt tools_fr.txt): Docs: Minor fixes to tools (4-lang)
[04:23:52] <CIA-95> EMC: 03cradek 07master * rd27513c186e4 10/docs/src/lathe/ (4 files): Docs: Minor fixes to lathe-user (4-lang)
[04:23:53] <CIA-95> EMC: 03cradek 07master * r509aa8653473 10/docs/src/motion/ (4 files): Docs: Minor fixes to kinematics (4-lang)
[04:23:54] <CIA-95> EMC: 03cradek 07master * r6cf37d1d2195 10/docs/src/motion/ (4 files): Docs: Minor fixes to tweaking_steppers (4-lang)
[04:23:55] <CIA-95> EMC: 03cradek 07master * r9d7bfde606cc 10/docs/src/quickstart/ (4 files): Docs: Minor fixes to stepper_quickstart (4-lang)
[04:23:56] <CIA-95> EMC: 03cradek 07master * r7cb1cceefa39 10/docs/src/gui/ (gladevcp.txt gladevcp_de.txt gladevcp_es.txt gladevcp_fr.txt): Docs: Minor fixes to gladevcp (4-lang)
[04:23:58] <CIA-95> EMC: 03cradek 07master * r199de1abc40c 10/ (13 files in 8 dirs): Merge branch 'v2.5_branch' of ssh://git.linuxcnc.org/git/emc2 into v2.5_branch
[04:24:02] <CIA-95> EMC: 03cradek 07master * rd8f0ce2247ae 10/ (3 files in 3 dirs): Merge branch 'v2.5_branch' of ssh://git.linuxcnc.org/git/emc2 into v2.5_branch
[04:24:04] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[04:24:06] <CIA-95> EMC: 03cradek 07master * r688184c2115c 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -update to follow sserial changes, fix a sserial bug
[04:24:10] <CIA-95> EMC: 03cradek 07master * r130d9188c62d 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -fix an error when selecting 5i23 board
[04:24:14] <CIA-95> EMC: 03cradek 07master * r8deb663ea283 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -remove debugging messages
[04:24:17] <CIA-95> EMC: 03cradek 07master * r87bf5ace9194 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -add data to the sserial subboard array
[04:24:18] <CIA-95> EMC: 03cradek 07master * r9a3697335d5b 10/docs/rtfaults.txt: Document an easier way to track down segfaults.
[04:24:20] <CIA-95> EMC: 03cradek 07master * rcb1d99a6d858 10/docs/rtfaults.txt: Gosh Darn it! I chose a module with more than one problem as an example.
[04:24:23] <CIA-95> EMC: 03cradek 07master * r6850e0c07390 10/src/ (6 files in 2 dirs): Add support for the Mesa self-configuring Smart Serial (SSLBP) cards
[04:24:26] <CIA-95> EMC: 03cradek 07master * rdbd299629b9e 10/docs/src/common/ (4 files): Docs: Minor fixes to Linux_FAQ (4-lang)
[04:24:28] <CIA-95> EMC: 03cradek 07master * rb7a527348094 10/docs/src/common/ (4 files): Docs: Minor fixes to machining_center (4-lang)
[04:24:29] <CIA-95> EMC: 03cradek 07master * rcfa1380e9d8f 10/docs/src/config/ (4 files): Docs: Minor fixes to ini_config (4-lang)
[04:24:30] <CIA-95> EMC: 03cradek 07master * r770a198f0d8a 10/docs/src/examples/ (4 files): Docs: Minor fixes to gs2_example (4-lang)
[04:24:32] <CIA-95> EMC: 03cradek 07master * rcf460629edf6 10/docs/src/examples/ (spindle.txt spindle_de.txt spindle_es.txt spindle_fr.txt): Docs: Minor fixes to spindle.txt (4-lang)
[04:24:33] <CIA-95> EMC: 03cradek 07master * r940fd4239f14 10/docs/src/gcode/ (4 files): Docs: Minor fixes to coordinates (4-lang)
[04:24:35] <CIA-95> EMC: 03cradek 07master * ra1fc9588a696 10/docs/src/gcode/ (main.txt main_de.txt main_es.txt main_fr.txt): Docs: Minor fixes to main (4-lang)
[04:24:35] <CIA-95> EMC: 03cradek 07master * rbbb95858ba35 10/docs/src/gcode/ (overview.txt overview_de.txt overview_es.txt overview_fr.txt): Docs: Minor fixes to overview (4-lang)
[04:24:36] <CIA-95> EMC: 03cradek 07master * r8955a622fb60 10/docs/src/hal/ (4 files): Docs: Minor fixes to general_ref (4-lang)
[04:24:37] <CIA-95> EMC: 03cradek 07master * r0c41d165f4d9 10/docs/src/hal/ (pyvcp.txt pyvcp_de.txt pyvcp_es.txt pyvcp_fr.txt): Docs: Minor fixes to pyvcp (4-lang)
[04:24:38] <CIA-95> EMC: 03cradek 07master * rc2dd5ef9a8af 10/docs/src/lathe/ (4 files): Docs: Minor fixes to lathe-user (4-lang)
[04:24:39] <CIA-95> EMC: 03cradek 07master * ra5046f90f416 10/docs/src/motion/ (4 files): Docs: Minor fixes to tweaking-steppers (4-lang)
[04:24:41] <CIA-95> EMC: 03cradek 07master * r2b0239f8a11d 10/docs/src/hal/ (intro.txt intro_de.txt intro_es.txt): Docs: Minor fixes to intro, intro_de, intro_es
[04:24:43] <CIA-95> EMC: 03cradek 07master * ra8a7fc670931 10/docs/src/config/ (pncconf.txt pncconf_de.txt pncconf_es.txt pncconf_fr.txt): Docs: Minor fixes to pncconf.txt (4-lang)
[04:24:46] <CIA-95> EMC: 03cradek 07master * r95862411c026 10/docs/src/common/userforeword_fr.txt: Docs: Minor fix to userforeword_fr.txt
[04:24:52] <CIA-95> EMC: 03cradek 07master * r0ba860c340f4 10/ (257 files in 40 dirs): Merge my 'v2.5_branch' into v2.5_branch
[04:24:52] <CIA-95> EMC: 03cradek 07master * r4e3c0e12cbc7 10/docs/src/config/ (pncconf_de.txt pncconf_es.txt pncconf_fr.txt): Docs: Oops, redo on a fix I just did
[04:24:56] <CIA-95> EMC: 03cradek 07master * rcda0ca5b294e 10/ (112 files in 13 dirs): Merge branch 'v2.5_branch'
[04:24:58] <CIA-95> EMC: 03cradek 07master * r12adbee820ec 10/src/po/fr.po: French translation update
[04:25:00] <CIA-95> EMC: 03cradek 07master * re2e8100a47da 10/ (docs/src/common/outdated-notice_fr.txt src/po/fr.po): French translation update
[04:25:03] <CIA-95> EMC: 03cradek 07master * rdaf2deecce87 10/src/po/fr.po: French translation update
[04:25:04] <CIA-95> EMC: 03cradek 07master * r6025110b3de2 10/docs/src/quickstart/stepper_quickstart_fr.txt: French translation update
[04:25:06] <CIA-95> EMC: 03cradek 07master * rc119afd22ab8 10/docs/src/quickstart/stepper_quickstart_fr.txt: French translation update
[04:25:07] <CIA-95> EMC: 03cradek 07master * reb8699e353ac 10/docs/src/quickstart/stepper_quickstart_fr.txt: French translation update
[04:27:43] -!-
emcrules_w700 has quit [Quit: Visitor from www.linuxcnc.org]
[04:31:46] -!-
stormlight has quit [Quit: stormlight]
[04:33:25] -!-
Valen has quit [Ping timeout: 260 seconds]
[04:47:31] -!-
stormlight has quit [Client Quit]
[04:49:33] -!-
zervouli has quit [Ping timeout: 265 seconds]
[04:59:59] -!-
vladimirek [
[email protected]] has joined #emc-devel
[05:07:56] -!-
psha[work] [psha[work]
[email protected]] has joined #emc-devel
[05:29:59] -!-
theorbtwo has quit [Ping timeout: 276 seconds]
[05:55:08] -!-
ve7it has quit [Remote host closed the connection]
[06:22:25] -!-
bootnecklad_ has quit [Ping timeout: 255 seconds]
[06:31:42] -!-
factor has quit [Read error: Connection reset by peer]
[06:44:58] -!-
mhaberler [
[email protected]] has joined #emc-devel
[07:01:55] -!-
emc_rules has quit [Read error: Operation timed out]
[07:38:08] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-vayaxkgncgupvipe] has joined #emc-devel
[07:56:37] -!-
mhaberler has quit [Quit: mhaberler]
[07:58:40] -!-
tissf [tissf!5a13da4c@gateway/web/freenode/ip.90.19.218.76] has joined #emc-devel
[08:00:23] -!-
emc_rules has quit [Read error: Operation timed out]
[08:18:58] -!-
Quack has quit [Ping timeout: 255 seconds]
[08:19:50] -!-
vladimirek has quit [Remote host closed the connection]
[08:22:45] -!-
Danimal_garage has quit [Read error: Connection reset by peer]
[08:39:55] -!-
Valen has quit [Remote host closed the connection]
[08:42:21] -!-
Valen has quit [Remote host closed the connection]
[08:58:40] -!-
Valen has quit [Quit: Leaving.]
[08:59:41] -!-
Valen has quit [Remote host closed the connection]
[09:01:11] -!-
mhaberler [
[email protected]] has joined #emc-devel
[09:13:01] -!-
elmo40 has quit [Ping timeout: 260 seconds]
[09:18:39] -!-
Poincare has quit [Quit: changing servers]
[09:28:53] -!-
mhaberler has quit [Quit: mhaberler]
[09:36:06] -!-
robh__ [
[email protected]] has joined #emc-devel
[09:39:52] -!-
mhaberler [
[email protected]] has joined #emc-devel
[09:47:58] -!-
mhaberler has quit [Quit: mhaberler]
[09:49:10] -!-
bootnecklad__ has quit [Ping timeout: 260 seconds]
[09:55:34] -!-
Quack has quit [Ping timeout: 259 seconds]
[10:17:28] -!-
mhaberler [
[email protected]] has joined #emc-devel
[10:32:02] -!-
pingufan has quit [Remote host closed the connection]
[10:41:17] -!-
mhaberler_ [
[email protected]] has joined #emc-devel
[10:41:17] -!-
mhaberler has quit [Read error: Connection reset by peer]
[10:41:19] mhaberler_ is now known as
mhaberler
[10:44:27] -!-
A2Sheds has quit [Quit: puff of smoke]
[10:52:12] -!-
Guest43109 has quit [Ping timeout: 240 seconds]
[10:54:13] -!-
mhaberler has quit [Ping timeout: 255 seconds]
[10:56:46] -!-
pingufan has quit [Remote host closed the connection]
[11:04:36] -!-
mhaberler [
[email protected]] has joined #emc-devel
[11:06:50] <alex_joni> mhaberler: I am now
[11:07:52] <mhaberler> issue closed since, I guess
[11:14:41] -!-
mhaberler has quit [Read error: Connection reset by peer]
[11:15:18] -!-
mhaberler [
[email protected]] has joined #emc-devel
[11:26:41] <alex_joni> best kind of issues then ;)
[11:31:18] -!-
mhaberler has quit [Read error: Connection reset by peer]
[11:50:07] -!-
Calyp has quit [Ping timeout: 248 seconds]
[13:05:18] <CIA-95> EMC: 03jthornton 07v2.5_branch * rfe042995f862 10/tcl/bin/pickconfig.tcl: pickconfig: fix var name error
[13:05:18] <CIA-95> EMC: 03jthornton 07v2.5_branch * rf535aaf434d7 10/tcl/bin/pickconfig.tcl: pickconfig: support recursion into directories
[13:05:19] <CIA-95> EMC: 03jthornton 07v2.5_branch * r7f8f6d9e06ae 10/tcl/bin/pickconfig.tcl: pickconfig: improve detail_box text display
[13:05:20] <CIA-95> EMC: 03jthornton 07v2.5_branch * rfaf7a3a02d0d 10/configs/ (21 files in 4 dirs): configs: modify some examples to demo nested configurations
[13:05:21] <CIA-95> EMC: 03jthornton 07v2.5_branch * r188597c5d997 10/tcl/bin/pickconfig.tcl: pickconfig: minor refactor, use implicit global naming
[13:05:23] <CIA-95> EMC: 03jthornton 07v2.5_branch * r4b4e9923ff59 10/tcl/bin/pickconfig.tcl: pickconfig: show minimal tree when starting
[13:05:23] <CIA-95> EMC: 03jthornton 07v2.5_branch * r0d938107ad47 10/tcl/bin/pickconfig.tcl: pickconfig: use emc::standard_fixed_font for detail_box
[13:05:24] <CIA-95> EMC: 03jthornton 07v2.5_branch * r446f4a633f65 10/configs/sim/ (27 files in 3 dirs): configs/sim: make subdirs for axis and tkemc configs
[13:05:24] <CIA-95> EMC: 03jthornton 07v2.5_branch * rba064b83b80f 10/configs/sim/ (7 files in 2 dirs): configs/sim use subdirectory for gladevcp
[13:05:25] -!-
mhaberler [
[email protected]] has joined #emc-devel
[13:05:25] <CIA-95> EMC: 03jthornton 07v2.5_branch * rf78bfe069c04 10/share/axis/tcl/axis.tcl: axis.tcl: make auto_path work for RIP with tcl packages
[13:06:15] <jthornton> hmm I must have applied the patch wrong, should have been Dewey
[13:07:05] <jthornton> crap there it is git am --signoff
[13:07:26] <jthornton> is it too late to back up and try again?
[13:10:21] <jthornton> well the commit e-mail showed Dewey...
[13:10:49] <psha[work]> jthornton: no problem - it's just commiter, not author
[13:11:01] <jthornton> ah ok, thanks psha[work]
[13:11:22] <psha[work]> it's a cia's bug
[13:11:35] <jthornton> ok
[13:12:13] <jthornton> I thought I did something wrong :/
[13:19:24] -!-
psha[work] has quit [Quit: Lost terminal]
[13:38:37] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[13:39:05] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[14:04:45] -!-
Valen has quit [Quit: Leaving.]
[14:07:03] -!-
skunkworks [
[email protected]] has joined #emc-devel
[14:12:27] -!-
mhaberler has quit [Quit: mhaberler]
[14:14:25] -!-
emc_rules has quit [Ping timeout: 260 seconds]
[14:30:13] -!-
psha [
[email protected]] has joined #emc-devel
[14:32:03] -!-
roberth_ [
[email protected]] has joined #emc-devel
[14:33:39] -!-
robh__ has quit [Ping timeout: 260 seconds]
[14:42:48] -!-
servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[14:45:52] -!-
acemi has quit [Quit: WeeChat 0.3.2]
[15:15:20] -!-
mrsun has quit [Ping timeout: 256 seconds]
[15:16:18] -!-
JT-Hardinge [
[email protected]] has joined #emc-devel
[15:19:26] -!-
JT-Hardinge has quit [Client Quit]
[15:57:45] -!-
ve7it [
[email protected]] has joined #emc-devel
[15:59:53] -!-
frysteev has quit [Read error: Connection reset by peer]
[16:18:57] -!-
e-ndy has quit [Quit: Ex-Chat]
[16:26:51] -!-
Nick001 has quit [Read error: Connection reset by peer]
[16:29:28] -!-
pingufan has quit [Remote host closed the connection]
[16:33:48] -!-
jstenback has quit [Ping timeout: 240 seconds]
[16:39:05] -!-
bootnecklad_ has quit [Ping timeout: 260 seconds]
[16:44:52] bootnecklad__ is now known as
bootnecklad`
[16:57:56] -!-
grommit has quit [Quit: ChatZilla 0.9.87 [Firefox 3.6.23/20110921065534]]
[17:00:41] -!-
vladimirek [
[email protected]] has joined #emc-devel
[17:04:14] -!-
bootnecklad` has quit [Ping timeout: 252 seconds]
[18:14:13] -!-
grommit has quit [Quit: ChatZilla 0.9.87 [Firefox 3.6.23/20110921065534]]
[18:34:56] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[18:37:47] -!-
Poincare has quit [Quit: changing servers]
[18:41:53] -!-
bootnecklad_ has quit [Ping timeout: 260 seconds]
[18:45:19] -!-
factor has quit [*.net *.split]
[18:45:55] bootnecklad__ is now known as
bootnecklad`
[19:08:58] -!-
JT-Shop_ [
[email protected]] has joined #emc-devel
[19:10:49] -!-
JT-Shop has quit [Ping timeout: 260 seconds]
[19:10:54] JT-Shop_ is now known as
JT-Shop
[19:33:29] -!-
IchGucksLive has quit [Quit: ChatZilla 0.9.86 [Firefox 3.6.23/20110921065534]]
[19:36:04] -!-
isssy has quit [Ping timeout: 252 seconds]
[20:05:43] -!-
Rogge has quit [Ping timeout: 258 seconds]
[20:06:06] -!-
psha has quit [Quit: Lost terminal]
[20:11:22] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust492.basl.cable.virginmedia.com] has joined #emc-devel
[20:14:23] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[20:14:54] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[20:20:36] -!-
chester88 has quit [Ping timeout: 240 seconds]
[20:27:05] -!-
JT-Shop_ [
[email protected]] has joined #emc-devel
[20:27:34] -!-
JT-Shop has quit [Ping timeout: 258 seconds]
[20:27:46] JT-Shop_ is now known as
JT-Shop
[20:30:51] -!-
mhaberler [
[email protected]] has joined #emc-devel
[20:31:22] -!-
bootnecklad has quit [Quit: WeeChat 0.2.6]
[20:32:53] -!-
bootnecklad` has quit [Quit: Leaving]
[20:34:16] -!-
bootnecklad has quit [Client Quit]
[20:34:27] -!-
chester88 [
[email protected]] has joined #emc-devel
[20:38:54] <mhaberler> seb_kuzminsky: trying to parse buildbot output.. am I right that the the dust has settled?
[20:49:03] crib- is now known as
crib
[20:56:00] -!-
issy has quit [Quit: Visitor from www.linuxcnc.org]
[21:04:38] -!-
factor has quit [Ping timeout: 252 seconds]
[21:05:54] -!-
ries has quit [Ping timeout: 258 seconds]
[21:14:11] -!-
vladimirek has quit [Remote host closed the connection]
[21:16:14] -!-
vladimirek [
[email protected]] has joined #emc-devel
[21:16:32] -!-
vladimirek has quit [Remote host closed the connection]
[21:24:18] <JT-Shop> mhaberler: Dewey fixed the config picker so you don't need to move any of your configs
[21:24:54] <mhaberler> great! need to check this out
[21:27:38] -!-
mrsun has quit [Quit: Leaving]
[21:38:24] -!-
Goslowjimbo has quit [Quit: Leaving]
[21:50:02] -!-
rizo has quit [Quit: Leaving]
[21:56:54] -!-
FinboySlick has quit [Quit: Leaving.]
[21:59:06] -!-
acemi has quit [Quit: WeeChat 0.3.2]
[22:03:08] -!-
syyl_ has quit [Quit: Verlassend]
[22:05:14] -!-
Quack has quit [Ping timeout: 258 seconds]
[22:09:53] <CIA-95> EMC: 03tissf 07v2.5_branch * r5c51a5f913d2 10/docs/src/quickstart/stepper_quickstart_fr.txt: deleted unnecessary latexmath
[22:09:54] <CIA-95> EMC: 03tissf 07v2.5_branch * rcd8431e5fc68 10/docs/src/config/ (copy_and_run_fr.txt emc2hal_fr.txt ini_config_fr.txt): French translation update, deleted latexmath not working
[22:12:18] -!-
JT-Shop has quit [Ping timeout: 252 seconds]
[22:13:07] -!-
jthornton has quit [Ping timeout: 260 seconds]
[22:15:24] <andypugh> I am trying to sort out a merge conflict. Which file is which between REMOTE, LOCAL and (no suffix)?
[22:17:35] <mhaberler> JT-shop: the remap configs now appear, but it seems I missed an assumption on in which directory emc is started when a config is run from the selector+
[22:18:35] <mhaberler> andypugh: I understand LOCAL is the checked out branch, REMOTE is the merge branch
[22:18:55] <mhaberler> no suffix is the tentative result
[22:19:01] <mhaberler> mergetool?
[22:19:08] <mhaberler> meld?
[22:19:08] <andypugh> meld
[22:19:39] <andypugh> I am trying to cheery-pick a commit from master to 2.5
[22:20:02] <andypugh> I tried rebasing, but that didn't want to work. Cherry-pick seemed better
[22:21:24] <andypugh> But there are three columns...
[22:22:47] <mhaberler> meld says the filenames in the top bar?
[22:23:05] <mhaberler> the center window is what you're producing
[22:23:43] <andypugh> Yes, but, unsurprisingly, the file names are the same.
[22:24:07] <andypugh> Except one is plain, one has LOCAL and one has REMOTE
[22:24:27] <mhaberler> right - you're doint one file conflict at a time?
[22:24:46] <andypugh> I only have one file conflicting
[22:25:44] <andypugh> It looks like LOCAL was the file in my commit, and <no_suffix> was the cherry-pick commit. REMOTE was the cherry-pick base.
[22:26:07] <mhaberler> fine, so you get the three-pane window with 'file in current branch' as left pane (with LOCAL), 'file in branch being merged' in right pane (with REMOTE in filename) and the center pane is the merge result - you fix it there and then save it
[22:26:34] <mhaberler> right-click on center pane, save
[22:26:41] <mhaberler> when done that is
[22:26:55] <andypugh> That don't seem to be the way it wanted to work..
[22:27:08] <mhaberler> let me see, which commit did you pick?
[22:27:24] <andypugh> A commit only I have..
[22:27:53] <mhaberler> tough call to reproduce..
[22:28:07] <andypugh> What seems to have worked is moving the things I wanted to keep into the left pane.
[22:29:03] <mhaberler> no, I always move things into the center pane with the unmodified filename, and dont forget to save it or nothing happens; also commit thereafter
[22:29:14] <andypugh> Well, I assume that the situation is the same for any commit based on master to a branch based on 2.5 where there are more changes to the file between the two than just the single commit.
[22:30:13] <mhaberler> in that case the cherry-pick wont get you far I think, because you're losing the intermediate changes
[22:30:31] <andypugh> The complication is that the 7i65 and 7i49 patches touch a lot of the same files. But 7i65 is a master-only patch, but I want to pull 7i49 into 2.5
[22:31:12] <mhaberler> are there several changes to 7i65 in master?
[22:31:19] <mhaberler> i mean commits?
[22:31:27] <andypugh> Just the one, I think
[22:32:14] <andypugh> The 7i65 introduces BSPI and a whole new way for Comps to interact with Hostmot2
[22:32:37] <mhaberler> well what you can do is checkout master, reset soft to v2.5_branch, commit the files you need, and then switch to v2.5_branch and pick that commit
[22:32:55] <andypugh> (A comp can ask hostmot2 for a pointer to a module)
[22:33:06] <mhaberler> duh
[22:33:57] -!-
skunkworks has quit []
[22:34:00] <andypugh> The commit already existed?
[22:34:38] <andypugh> Or you mean make a new commit, hoping that I have some idea which files were involved?
[22:34:47] <mhaberler> in which branch do you have the commit you want to get into v2.5_branch?
[22:35:20] <mhaberler> yes, create a new commit onto of v2.5_branch which just has what you need
[22:35:30] <mhaberler> ontop
[22:35:46] <andypugh> Isn't that what cherry-picking does?
[22:36:13] <mhaberler> only if the commit you're picking has everything in it what you need
[22:36:43] <andypugh> I assumed (possibly wrongly) that a cherry-pick meant "take the differences between this commit and the preceding commit, and apply them to the current branches files"
[22:37:17] <mhaberler> no cherry-pick only applies the diff in that very commit, not the history leading up to it
[22:37:28] <andypugh> And the commit does include everything, it is one monolithic commit
[22:38:04] <mhaberler> is v2.5_branch an ancestor of that commit?
[22:38:28] <andypugh> Only in the sense that 2.5 is an ancestor of Master
[22:38:55] <mhaberler> but I assume v2.5_branch has diverged from that since
[22:39:24] <andypugh> diverged from what?
[22:39:37] <mhaberler> from the common ancestor
[22:39:44] <andypugh> The commit was rebased on a fresh pull of master.
[22:40:29] <mhaberler> do you have a public repo where you can push it?
[22:40:34] <andypugh> No
[22:40:52] <andypugh> It just built, it might be done.
[22:40:52] <mhaberler> you're lacking style ;-)
[22:41:48] <mhaberler> anyway, that three-pane thing had me confused too
[22:42:45] <andypugh> They could at least label them. (or at the very least right-justify the filename)
[22:48:42] -!-
odiug has quit [Ping timeout: 260 seconds]
[22:58:13] <tissf> hello, I want push in v2.5_branch but:
[22:58:15] -!-
mhaberler has quit [Quit: mhaberler]
[22:58:21] <tissf> ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'ssh://
[email protected]/git/emc2.git'
[22:58:37] <tissf> someone can help me ?
[23:09:08] <CIA-95> EMC: 03tissf 07v2.5_branch * r9647a2647a5a 10/ (440 files in 88 dirs): Merge branch 'master' into v2.5_branch
[23:11:11] <tissf> I'm not sure of myself on this action!
[23:12:11] <tissf> the problem is still there :(
[23:13:05] <andypugh> Sorry, if I had any idea how to work git I would help. But it baffles me too.
[23:13:06] <tissf> I hope I did not broken anything
[23:13:34] <andypugh> But that didn't look like the right thing to do.
[23:14:06] <andypugh> I think you might have merged all of master into v2.5
[23:14:37] -!-
JT-Shop [
[email protected]] has joined #emc-devel
[23:14:39] <andypugh> Git never throws anything away, though, so it can probably be rescued
[23:15:02] <tissf> i hope really
[23:15:37] <JT-Shop> slight power outage here
[23:16:01] <andypugh> I think it is OK, it looks to be _your_ master not the main master
[23:17:14] <tissf> OK I breathe
[23:17:24] <andypugh> if you look at the commitdiff at git.linuxcnc.org then I don't think you did what you wanted to do, but it isn't a disaster.
[23:19:11] <tissf> it's very complicated for me
[23:19:48] <JT-Shop> what happened?
[23:20:00] <tissf> cd8431e..9647a26 v2.5_branch -> v2.5_branch ! [rejected] master -> master (non-fast-forward)
[23:20:30] <andypugh> Or:
http://git.linuxcnc.org/gitweb?p=emc2.git;a=commitdiff;h=9647a2647a5a8fce1f11625b2c9ec2d1e14f61d7
[23:20:42] <JT-Shop> did you do a git pull --rebase before trying to push?
[23:20:50] <tissf> i want push on v2.5_branch but conflict
[23:22:31] <tissf> the conflict comes from the file Getting_Started fr.txt
[23:23:00] <andypugh> I think that, actually, you did merge master into 2.5, but it has been reverted?
[23:23:32] <JT-Shop> I think cradek fixed that somehow
[23:24:25] <JT-Shop> tissf: have you commited all your changes on your local branch?
[23:24:41] <JT-Shop> I find git gui to be of some help to me
[23:25:21] <tissf> no because a conflict appears
[23:26:00] <tissf> i have two stash in the stash list
[23:27:49] <JT-Shop> I've never used stash... I just give up and get a fresh checkout :)
[23:29:30] <tissf> I do not want to lose my job but I'm afraid now...
[23:31:20] <tissf> error: failed to push some refs to 'ssh://
[email protected]/git/emc2.git'
[23:31:36] <tissf> Merge the remote changes before pushing again.
[23:32:40] <tissf> <JT-Shop> how merge the remote changes?
[23:35:59] <JT-Shop> Francis, I've never done a merge :(
[23:36:25] <JT-Shop> cradek: will have to help with that
[23:36:38] <JT-Shop> you might have to take a cut in pay now :)
[23:36:47] -!-
Quack has quit [Ping timeout: 248 seconds]
[23:37:08] <tissf> ;)
[23:38:36] <JT-Shop> there is git reset --hard or something like that but I can't advise it
[23:38:55] <tissf> I'll wait cradek tomorrow, if he agrees to talk to me again
[23:39:30] <JT-Shop> do you use git gui to view the branch history?
[23:39:45] <tissf> no xterm
[23:40:04] <JT-Shop> I've never used that...
[23:40:58] <tissf> I do not understand the GUI...
[23:41:58] <tissf> what gui you use?
[23:42:06] <JT-Shop> git gui
[23:42:41] <tissf> I will look
[23:43:13] <JT-Shop> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Install_git_on_your_system
[23:43:43] <JT-Shop> In the package manager, select the package "git-core" (the package "git" is an unrelated program; don't choose it). Optionally, select "gitk" or "qgit" (not on Dapper) to graphically view project history, and "git-gui" to graphically select files to commit.
[23:44:10] <JT-Shop> I like git gui to select files for commiting makes it easier to see what I'm about to screw up
[23:44:24] <andypugh> I think you always get gitgui. Just type 'git gui' on the command line (you need to be somewhere inside your git hiearchy)
[23:45:24] <JT-Shop> you can find out real fast if you have it
[23:51:06] -!-
Guest589 has quit [Quit: Visitor from www.linuxcnc.org]
[23:51:36] <tissf> gitk works but I have to learn
[23:52:41] <tissf> I already do crap with the console so I fear the worst
[23:57:16] <tissf> Bed time here, see you again soon - good night
[23:58:23] <JT-Shop> take a look at both of them
[23:58:23] <JT-Shop> I have to run/swim to the house now