Back
[13:18:03] <alex_joni> jepler: around?
[13:34:28] <jepler> alex_joni: yeah
[13:34:46] <alex_joni> trying to pull some of your git stuff
[13:34:56] <alex_joni> but I'm not really getting anywhere
[13:35:02] <alex_joni> tried to pull from rtai
[13:35:28] <alex_joni> fatal: Untracked working tree file 'rtai-lab/scilab/devices/GNUmakefile' would be overwritten by merge.
[13:35:36] <alex_joni> (that's what I get from "git pull")
[13:35:54] <jepler> is there any change in your working tree that you care about?
[13:35:59] <alex_joni> no
[13:36:34] <jepler> git reset --hard; git clean -f -x -d
[13:36:55] <jepler> that will set any modified files back to the ones in the last checkout, and remove any files you created that are not tracked
[13:37:02] <alex_joni> the reset --hard I already did
[13:37:11] <alex_joni> aha, ok.. now git pull?
[13:37:19] <jepler> yes try that again
[13:37:52] <alex_joni> well.. it didn't error out :)
[13:37:58] <jepler> good
[13:38:15] <alex_joni> and I see 3.6.1-linuxcnc.2 in changelog
[13:38:37] <alex_joni> I see you have an abi16 branch on ubuntu-hardy-rtai
[13:39:13] <rayh> Hi jepler I modified that Submake that was leaving the empty image files in the man directory during clean.
[13:39:16] <alex_joni> should I pull from that? or from master..
[13:39:42] <rayh> Is there a way to remove that file when the routine using it is finished?
[13:39:49] <jepler> let me figure out the answer to that
[13:39:55] <jepler> rayh: I am not sure
[13:40:30] <alex_joni> I see ubuntu folks are at abi-19
[13:42:54] <jepler> alex_joni: you'll want to pull from both rtai and kernel again (I had changes that I hadn't pushed yet) and use my master
[13:45:36] <alex_joni> git pull jeff master
[13:45:37] <alex_joni> ?
[13:45:55] <alex_joni> ok.. seems to be doing something :)
[13:47:15] <jepler> hm I hope I didn't break something
[13:47:18] <jepler> but I fear I did
[13:47:22] <jepler> I just built and got an error
[13:47:23] <jepler> ln: creating symbolic link `debian/tmp/lib/modules/2.6.24-16-rtai/rtai': No such file or directory
[13:48:49] <alex_joni> it started building here
[13:50:24] <jepler> was missing something in debian/rules
[13:50:34] <jepler> you'll need to pull again or you'll get the same error as me
[13:50:39] <alex_joni> hmm.. so I should stop it then
[13:51:04] <alex_joni> eek
[13:51:05] <alex_joni> crap
[13:51:19] <alex_joni> I ran "git pull"
[13:51:29] <alex_joni> forgot the jeff part.. and it started pulling from Ubuntu
[13:51:44] <alex_joni> git pull jeff master
[13:51:45] <alex_joni> Already up-to-date.
[13:51:51] <jepler> I meant pull in rtai
[13:51:59] <alex_joni> ahhh.. that comes later :)
[13:52:18] <jepler> sorry I made you stop your build then
[13:52:31] <alex_joni> np.. it should resume pretty fast
[16:53:41] <pmbdk123> hey all
[16:53:55] <pmbdk123> anyone here? :)
[17:31:12] <CIA-34> EMC: 03jmkasunich 07TRUNK * 10emc2/src/emc/motion/command.c: typo in error message