Back
[00:16:18] -!-
factor has quit [Ping timeout: 260 seconds]
[00:20:23] -!-
Loetmichel has quit [Ping timeout: 260 seconds]
[00:21:18] -!-
gambakufu has quit []
[00:36:59] -!-
rob_h has quit [Ping timeout: 244 seconds]
[00:40:00] -!-
asdfasd has quit [Ping timeout: 265 seconds]
[01:05:21] Valen1 is now known as
Valen
[01:12:52] -!-
cmorley has quit [Ping timeout: 265 seconds]
[01:27:19] -!-
stevegt_ has quit [Ping timeout: 252 seconds]
[01:28:09] -!-
cmorley [cmorley!~chris@d64-180-201-90.bchsia.telus.net] has joined #linuxcnc-devel
[01:47:26] -!-
Gast540 has quit [Client Quit]
[01:49:40] -!-
sumpfralle has quit [Ping timeout: 272 seconds]
[02:35:59] -!-
demacus_ has quit [Ping timeout: 245 seconds]
[02:43:34] -!-
koax_ [koax_!~kelb@p508D4218.dip.t-dialin.net] has joined #linuxcnc-devel
[02:47:07] -!-
koax has quit [Ping timeout: 265 seconds]
[02:53:32] -!-
kb8wmc has quit [Quit: ChatZilla 0.9.88.2 [Firefox 11.0/20120310193829]]
[03:14:01] -!-
sumpfralle has quit [Ping timeout: 252 seconds]
[03:35:52] -!-
ve7it has quit [Remote host closed the connection]
[04:12:50] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[04:15:39] -!-
phantoxe has quit []
[04:24:12] -!-
stevegt_1 has quit [Ping timeout: 272 seconds]
[05:00:05] -!-
asdfasd [asdfasd!~grgrgrgrg@87.194.58.242] has joined #linuxcnc-devel
[05:00:05] -!-
asdfasd has quit [Client Quit]
[05:00:37] -!-
asdfasd [asdfasd!~grgrgrgrg@87.194.58.242] has joined #linuxcnc-devel
[05:01:33] -!-
ybit2 has quit [Changing host]
[05:03:51] ybit2 is now known as
ybit
[05:16:08] -!-
H264 has quit [Read error: Connection reset by peer]
[05:28:08] -!-
stevegt_1 has quit [Ping timeout: 240 seconds]
[05:28:55] <mhaberler> maintainence fixes for 2.5: do the still go into v2.5_branch?
[05:39:36] <KimK> mhaberler: I am not one of the git gurus, but that sounds like a pretty good place for them.
[05:51:51] e-ndy|afk is now known as
e-ndy
[06:47:29] <alex_joni> mhaberler: yup, and they will get released as 2.5.1
[06:47:37] <mhaberler> aja, thanks
[06:47:47] <alex_joni> also 2.5 branch gets merged to master from time to time, so they end up there aswell
[07:13:19] -!-
maximilian_h [maximilian_h!~bonsai@212.23.103.34] has joined #linuxcnc-devel
[07:21:35] -!-
mhaberler has quit [Ping timeout: 260 seconds]
[07:24:04] -!-
capricorn_one has quit [Remote host closed the connection]
[07:26:43] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[07:34:13] -!-
zlog has quit [Ping timeout: 265 seconds]
[07:38:09] -!-
mhaberler has quit [Quit: mhaberler]
[07:38:29] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[07:42:15] -!-
ktchk has quit [Ping timeout: 260 seconds]
[07:46:32] -!-
DanteTDI has quit [Remote host closed the connection]
[08:05:38] -!-
Thetawaves has quit [Quit: This computer has gone to sleep]
[08:05:45] -!-
mhaberler has quit [Quit: mhaberler]
[08:33:59] -!-
logger[psha] [logger[psha]!~loggerpsh@195.135.238.205] has joined #linuxcnc-devel
[08:50:20] -!-
Tecan has quit [Quit: live long and phosphor]
[08:50:52] -!-
mk0 has quit [Ping timeout: 245 seconds]
[09:05:48] -!-
DanteTDI has quit [Remote host closed the connection]
[09:19:15] -!-
vladimirek has quit [Remote host closed the connection]
[09:19:42] -!-
rob_h [rob_h!~rob_h@5ace70c9.bb.sky.com] has joined #linuxcnc-devel
[10:01:16] e-ndy is now known as
e-ndy|afk
[10:05:45] e-ndy|afk is now known as
e-ndy
[10:48:43] -!-
DanteTDI has quit [Read error: Connection reset by peer]
[11:14:06] e-ndy is now known as
e-ndy|afk
[11:30:59] -!-
bbarum has quit [Quit: Page closed]
[11:46:33] -!-
X704 has quit [Read error: Connection reset by peer]
[11:50:05] -!-
WalterN has quit [Ping timeout: 246 seconds]
[12:01:43] -!-
bedah has quit [Quit: bye]
[12:07:08] -!-
skunkworks__ has quit [Ping timeout: 240 seconds]
[12:45:00] e-ndy|afk is now known as
e-ndy
[12:45:58] e-ndy is now known as
e-ndy|afk
[12:48:21] -!-
engkur has quit [Quit: Leaving]
[12:56:55] -!-
phantoxe has quit [Remote host closed the connection]
[13:05:46] <CIA-68> 03jthornton 07v2.5_branch * r733c466e9e78 10/docs/src/gui/gladevcp.txt: Docs: fixed the assumption that the reader was using a git checkout
[13:08:14] -!-
mk0 has quit [Quit: LinuxCNC 2.5.0!]
[13:11:37] -!-
syyl has quit [Ping timeout: 276 seconds]
[13:14:59] e-ndy|afk is now known as
e-ndy
[13:20:47] -!-
howard_ has quit [Client Quit]
[13:29:57] -!-
maximilian_h [maximilian_h!~bonsai@130.255.104.157] has joined #linuxcnc-devel
[13:29:59] -!-
maximilian_h [maximilian_h!~bonsai@130.255.104.157] has parted #linuxcnc-devel
[14:07:34] -!-
mhaberler [mhaberler!~mhaberler@91.208.88.13] has joined #linuxcnc-devel
[14:09:46] -!-
ysli [ysli!~ysli@125-227-127-97.dynamic.hinet.net] has joined #linuxcnc-devel
[14:10:05] <ysli> cradek: hi
[14:10:30] <ysli> cradek: we have merged the ja3 into our repository at github
[14:12:57] <ysli> https://github.com/araisrobo/linuxcnc/commits/master
[14:12:58] <cradek> hi ysli
[14:13:22] <cradek> have you isolated the trajectory planner part of your code like we talked about?
[14:13:35] <ysli> that would be the next step
[14:13:40] <cradek> so it could go on a new branch off of linuxcnc's ja3 branch
[14:13:45] <cradek> ah ok, that's great
[14:14:37] <ysli> But I don't have write access to linuxcnc's git repository
[14:14:50] <ysli> will you create the branch for me?
[14:15:15] <mhaberler> ysli: I can push it if you want
[14:15:28] <jepler> I am not sure we should push this branch to linuxcnc.org yet
[14:15:48] <cradek> ysli: you'll have to make a patch set that we can review
[14:15:52] <ysli> okay
[14:16:31] <ysli> so I will create a github repository that is based on ja3
[14:17:38] <ysli> and create a branch, say joints_axes_scurve
[14:17:41] <jepler> ultimately, we need a branch with only the stuff we want (trajectory planner) and not the stuff we don't want (remove and then restore keyboard shortcuts in axis)
[14:17:55] <ysli> and merge only the s-curve related code into it
[14:18:25] <jepler> "merge" is a command and a technical term in git; it is probably not the right word for what needs to be done
[14:19:13] <jepler> in git I would think about accomplishing this task with tools like rebase and cherry-pick
[14:19:44] <ysli> it's difficult for me to express accurately in English :-)
[14:20:06] <ysli> I see
[14:20:09] <jepler> step 1: identify the commits that implement the trajectory planner enhancements
[14:20:27] <jepler> step 2: use "git rebase" or "git cherry-pick" to create a branch that starts at master or ja3 and contains only those commits
[14:21:54] <ysli> do I have to cherry-pick all related commits?
[14:22:10] <jepler> yes. cherry-pick works one commit at a time.
[14:22:51] <ysli> It's a long period for implement/polishing that s-curve algorithm
[14:24:07] <ysli> Is it possible that I cherry-pick the latest one, and git will finish picking all the other related commits automatically?
[14:24:23] <cradek> no
[14:24:32] <cradek> if you cherry-pick just the latest one, it will not apply
[14:24:33] <jepler> the point is to eliminate the stuff that is unrelated to the trajectory planner
[14:25:44] <jepler> this can be done on a fresh branch by cherry-picking each commit related to the trajectory planner
[14:26:54] <jepler> it's true that with 849 commits in your branch that are not in linuxcnc joints_axes3 this is not an easy task
[14:28:13] <ysli> anyway, I got to start the move
[14:28:20] <jepler> another git tool that is relevant is git rebase. Create a new branch from araisrobo/master, then "git rebase -i"
[14:28:29] <ysli> otherwise, it will be even difficult
[14:28:36] <jepler> er, "git rebase -i origin/joints_axes3"
[14:28:49] <jepler> this will give you an editor with one line for each commit in your branch that is not in origin/joints_axes3
[14:29:10] <jepler> to not include a commit in your rebased branch, simply delete its line
[14:29:23] <jepler> when you've deleted all the lines that do not pertain to the trajectory planner, write and exit from the editor
[14:29:49] <jepler> then git will recreate the branch using only the indicated commits, stopping when it can't automatically determine what to do
[14:30:22] <ysli> thanks for your guide
[14:30:39] <jepler> there are also a lot of guides to git on the internet.
[14:30:42] <ysli> the better way would be "rebase", right?
[14:31:07] <jepler> yes, I would probably do it with "rebase"
[14:31:44] <ysli> I will try rebase tomorrow
[14:32:30] <ysli> how many hours would you estimate for this "rebase" process?
[14:32:58] <cradek> nobody but you can answer this
[14:33:21] -!-
maximilian_h [maximilian_h!~bonsai@anon-151-8.vpn.ipredator.se] has joined #linuxcnc-devel
[14:33:21] <ysli> :-p
[14:33:22] <ysli> I see
[14:33:30] <cradek> we have no idea how hard it will be to separate the TP from other changes, since we don't know how you committed things along the way
[14:33:47] <cradek> if you have commits that contain changes to many features, some wanted, some unwanted, it will be hard
[14:33:58] <cradek> if your commits always just change one feature, it will be very easy
[14:34:48] <ysli> We did that with the hard way at beginning
[14:35:16] <jepler> bbl
[14:35:31] <ysli> At that time, me and hsuyao were not familiar with the rule for developing with git
[14:36:25] <ysli> bbl
[14:37:02] -!-
maximilian_h [maximilian_h!~bonsai@anon-151-8.vpn.ipredator.se] has parted #linuxcnc-devel
[14:37:39] -!-
ysli has quit [Quit: Leaving]
[14:59:30] -!-
sumpfralle has quit [Ping timeout: 260 seconds]
[15:19:24] -!-
maximilian_h [maximilian_h!~bonsai@anon-137-180.vpn.ipredator.se] has joined #linuxcnc-devel
[15:36:38] -!-
phantoxe has quit [Ping timeout: 240 seconds]
[15:38:35] -!-
maximilian_h has quit [Ping timeout: 260 seconds]
[15:40:23] -!-
cevad has quit [Ping timeout: 246 seconds]
[15:43:11] -!-
skunkworks [skunkworks!~skunkwork@68-115-41-210.static.eucl.wi.charter.com] has joined #linuxcnc-devel
[15:52:49] -!-
sumpfralle has quit [Ping timeout: 246 seconds]
[15:58:25] -!-
maximilian_h [maximilian_h!~bonsai@anon-148-56.vpn.ipredator.se] has joined #linuxcnc-devel
[16:06:48] -!-
syyl_ws has quit [Quit: Verlassend]
[16:10:20] -!-
ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #linuxcnc-devel
[16:13:18] -!-
Guest83733 has quit [Quit: ZNC -
http://znc.in]
[16:13:34] -!-
mhaberler has quit [Quit: mhaberler]
[16:13:59] -!-
DanteTDI has quit [Remote host closed the connection]
[16:17:57] -!-
tiago has quit [Remote host closed the connection]
[16:18:42] -!-
erasmo [erasmo!~erasmo@212.106.2.29] has joined #linuxcnc-devel
[16:25:32] -!-
maximilian_h has quit [Ping timeout: 246 seconds]
[16:31:04] Farthen is now known as
Guest45066
[16:33:18] Guest45066 is now known as
Farthen_
[16:34:23] Farthen_ is now known as
Farthen
[16:36:30] -!-
syyl_ has quit [Quit: Leaving]
[16:37:28] -!-
maximilian_h [maximilian_h!~bonsai@anon-153-15.vpn.ipredator.se] has joined #linuxcnc-devel
[17:00:25] -!-
cevad has quit [Ping timeout: 265 seconds]
[17:03:07] -!-
erasmo has quit [Ping timeout: 260 seconds]
[17:08:19] -!-
psha [psha!~psha@213.208.162.69] has joined #linuxcnc-devel
[17:15:37] -!-
erasmo [erasmo!~erasmo@212.106.27.195] has joined #linuxcnc-devel
[17:17:36] -!-
phantoxe has quit [Read error: Connection reset by peer]
[17:56:58] cylly2 is now known as
Loetmichel
[17:57:47] -!-
IchGuckLive has quit [Quit: ChatZilla 0.9.87 [Firefox 11.0/20120310193829]]
[18:38:06] -!-
sumpfralle1 has quit [Read error: Operation timed out]
[18:48:15] -!-
isssy has quit [Quit: Bye Bye]
[19:33:00] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[19:43:14] -!-
psha has quit [Quit: Lost terminal]
[19:56:24] -!-
maximilian_h has quit [Ping timeout: 245 seconds]
[20:05:23] -!-
FinboySlick has quit [Quit: Leaving.]
[20:15:38] -!-
maximilian_h [maximilian_h!~bonsai@anon-190-67.vpn.ipredator.se] has joined #linuxcnc-devel
[20:17:27] -!-
erasmo has quit [Remote host closed the connection]
[20:33:56] e-ndy is now known as
e-ndy|afk
[20:38:25] e-ndy|afk is now known as
e-ndy
[20:47:17] e-ndy is now known as
e-ndy|afk
[20:52:12] -!-
mhaberler [mhaberler!~mhaberler@BSN-77-151-107.dsl.siol.net] has joined #linuxcnc-devel
[21:03:58] -!-
DJ9DJ has quit [Quit: bye]
[21:04:12] -!-
mhaberler has quit [Quit: mhaberler]
[21:09:08] -!-
isssy has quit [Client Quit]
[21:11:54] -!-
maximilian_h1 [maximilian_h1!~bonsai@130.255.104.157] has joined #linuxcnc-devel
[21:12:01] -!-
maximilian_h1 [maximilian_h1!~bonsai@130.255.104.157] has parted #linuxcnc-devel
[21:12:32] -!-
maximilian_h has quit [Ping timeout: 245 seconds]
[21:34:34] -!-
bootnecklad has quit [Quit: BRB WIREWRAPPING]
[21:40:56] <asdfasd> I just did git clone
[21:41:08] <asdfasd> should I use branches?
[21:41:48] -!-
skunkworks has quit []
[22:22:40] -!-
bedah has quit [Quit: bye]
[22:42:22] -!-
stevegt_1 has quit [Read error: Connection reset by peer]
[22:46:25] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[22:47:01] -!-
cra_ has quit [Quit: Page closed]
[22:56:36] -!-
JT-Shop [JT-Shop!~John@184.20.140.167] has joined #linuxcnc-devel
[23:03:10] -!-
asdfasd has quit [Ping timeout: 265 seconds]
[23:05:25] -!-
rob__H [rob__H!~rob_h@5ace70c9.bb.sky.com] has joined #linuxcnc-devel
[23:05:29] -!-
H264 has quit [Ping timeout: 244 seconds]
[23:16:49] -!-
rob_h has quit [*.net *.split]
[23:16:49] -!-
fenn has quit [*.net *.split]
[23:16:49] -!-
Connor has quit [*.net *.split]
[23:16:50] -!-
mazafaka has quit [*.net *.split]
[23:16:50] -!-
uwe_ has quit [*.net *.split]
[23:16:50] -!-
kent has quit [*.net *.split]
[23:16:50] -!-
jtr has quit [*.net *.split]
[23:16:50] -!-
Tugge has quit [*.net *.split]
[23:17:40] -!-
jtr [jtr!~jtr@cpe-071-076-196-103.triad.res.rr.com] has joined #linuxcnc-devel
[23:20:31] -!-
kb8wmc has quit [Ping timeout: 264 seconds]
[23:25:46] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[23:28:35] -!-
sumpfralle has quit [Read error: Connection reset by peer]
[23:33:30] -!-
JT-Shop [JT-Shop!~John@184.20.140.167] has joined #linuxcnc-devel
[23:35:28] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[23:35:30] -!-
n2diy has quit [Quit: Ex-Chat]
[23:36:39] -!-
sumpfralle1 has quit [Ping timeout: 252 seconds]