Back
[11:57:41] <BigJohnT_> BigJohnT_ is now known as BigJohnT
[12:22:48] <BigJohnT> gitty up
[13:36:19] <skunkworks> heh
[14:02:33] <cradek> I'm starting the CVS->git conversion. The CVS is now read-only.
[14:04:15] <BigJohnT_> ok git'er done
[14:05:06] <SWPadnos> egad
[14:05:51] <skunkworks> wait - wait - should we be doing this? ;)
[14:06:14] <SWPadnos> http://www.youtube.com/watch?v=ZSFDm3UYkeE
[14:06:40] <cradek> what's that?
[14:06:59] <SWPadnos> an interesting google talk on managing open source projects
[14:07:33] <cradek> sounds cool, maybe I'll watch it later
[14:07:33] <SWPadnos> it's about an hour long, so make sure you're comfy
[14:07:56] <SWPadnos> it happens to be by a couple of the subversion developers
[14:10:41] <BigJohnT_> http://www.linuxcnc.org/component/option,com_kunena/Itemid,20/func,view/catid,21/id,457/lang,en/
[14:10:51] <SWPadnos> wow. the opto22 boards just arrived
[14:10:58] <SWPadnos> from California
[14:11:32] <jepler> BigJohnT_: I dunno. as far as I'm concerned, the %-to-% feature should be removed, because all it does is cause occasional problems
[14:12:10] <SWPadnos> but this is about M2
[14:12:38] <jepler> no, he says it's a "program without m02 at the end"
[14:12:54] <jepler> though it's not clear whether he means a bad program or one using %%
[14:13:00] <cradek> as far as I know, M2, M30 or %...% are required
[14:14:16] <SWPadnos> the way I read it, he's saying that he used to get an error message that the M2 was missing, and now (a) he doesn't get that message and (b) he has to type M2 in MDI to get things to work after running such a program
[14:14:42] <BigJohnT_> he must mean with %, I just tested and without M2 I get the file ended without...
[14:16:28] <BigJohnT_> when I wrap a program with %...% I get a file ended with no percent sign... in 2.4
[14:17:53] <BigJohnT_> jepler: I agree the % to % feature is not needed
[14:18:44] <SWPadnos> yeah, 0 and $FILE_SIZE are good markers for the beginning and end of the code :)
[14:19:13] <cradek> I think it ought to be possible to run a file not ending with M2/M30 (which reset a bunch of state). Currently the way to do that is by using %...%
[14:20:52] <BigJohnT_> I didn't realize the %...% was different
[14:21:03] <BigJohnT_> * BigJohnT_ wanders off to read the manual again
[14:21:41] <SWPadnos> in theory, you should be able to have random text before and after the % signs, and it's supposed to be ignored (IIRC)
[14:23:53] <cradek> I agree that's the idea, but I don't think emc has ever allowed there to be junk before
[14:23:59] <cradek> (but I bet after is ok)
[14:24:05] <BigJohnT_> and run several files without resetting a bunch of thinkg
[14:24:09] <BigJohnT_> things
[14:24:49] <cradek> lerman: alex and I set up CIA messages for 'wizards', and I also set it up to send commit messages the emc-commit list.
[14:25:10] <BigJohnT_> yep you have other junk after the closing %
[14:25:27] <SWPadnos> huh
[14:25:39] <SWPadnos> does /% work? (ie, selectable program stop point)
[14:26:05] <jepler> I sure hope not
[14:26:16] <cradek> wow
[14:26:28] <BigJohnT_> I just tested % ... % and then some random text typed in after the last %
[14:26:57] <BigJohnT_> BigJohnT_ is now known as BigJohnT
[14:27:00] <cradek> I bet /% works by pure accident
[14:27:05] <cradek> but, I won't go test it
[14:27:11] <SWPadnos> heh
[14:27:32] <cradek> some things it's better not to know.
[14:28:01] <SWPadnos> I'm thinking of setups like Roland's servo mounts
[14:28:15] <SWPadnos> where you would want to stop early while filling the stations
[14:30:34] <jmkasunich> that's what "Onnn if" is for
[14:30:53] <SWPadnos> sure, or /Oxxx call
[14:31:04] <BigJohnT> open a file with no M2 or starting %, close the error then run it anyway :)
[14:32:12] <jepler> didn't it move from station to station, rather than doing them in order?
[14:32:23] <jepler> so "o if" or "/o call" make more sense
[14:32:34] <SWPadnos> the program was written to do stage 1 then 2 then 3
[14:32:44] <BigJohnT> in trunk it locks up and repeats the error over and over
[14:32:48] <SWPadnos> but of course for four runs, you don't have all the stations filled
[14:33:07] <jmkasunich> SWPadnos: an early end would work when you are starting (filling the pipeline), but not at the end (when it is emptying)
[14:33:13] <SWPadnos> sure
[14:33:25] <jepler> "/" makes less sense since there are 3 stations and you only get two possibilities
[14:34:10] <SWPadnos> I guess it would be possible to make a parameter/var that's a loop counter
[14:34:23] <jmkasunich> if I was doing a high-production version of that, I'd have a switch at each station, use M6x to read the switches, and if to enable/skip each station's code
[14:34:43] <BigJohnT> in trunk if you open a file without an M2 it doesn't disable the run button in AXIS but 2.3.1 does disable the run button
[14:37:16] <cradek> do both report an error?
[14:37:47] <BigJohnT> when you try and open the file yes
[14:38:38] <BigJohnT> this time 2.3.1 ran the file without M2
[14:43:52] <BigJohnT> * BigJohnT wanders back out to work on the Ferguson
[14:54:24] <steves_logging> steves_logging is now known as steve_stallings
[15:37:29] <cradek> the move from CVS to git is done!
[15:38:20] <cradek> instructions for getting your new checkout are here:
http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git
[15:41:18] <jepler> I'm working hard to get wiki pages updated to refer to git instead of cvs
[15:47:41] <cradek> that's a thankless but heroic task
[15:56:47] <steve_stallings> total newbie question - the wiki instructions for git refer to git creating an emc2-src local directory, but the command line for git refers to emc2-dev, is this a typo or correct?
[15:57:09] <cradek> typo
[15:57:30] <steve_stallings> ok, which is your common practice?
[15:58:00] <cradek> I don't know yet :-)
[15:58:05] <cradek> he meant them to both say -dev
[15:59:36] <cradek> fixed, thanks
[15:59:41] <steve_stallings> thanks, being a newbie I want to be as conventional as possible for a while yet
[16:06:04] <BigJohnT> didn't someone say that you could do a git clone then just copy the created directory to another computer???
[16:15:47] <BigJohnT> bbl
[16:17:48] <cradek> sure, you can do that
[16:22:28] <steve_stallings> about to try compiling run-in-place on my laptop, but it is running stock Ubuntu for ease of network access, should I reboot to RTAI in order to compile only (run run EMC)?
[16:22:48] <steve_stallings> not run EMC
[16:23:00] <cradek> no, I don't think that's necessary
[16:23:15] <cradek> and if you don't care about running hardware, you can build with --enable-simulator and then never reboot at all
[16:23:45] <mozmck> I'm using eclipse (that might be heresy!) to look through the emc2 code, and I just looked at importing the new git repository with the jgit plugin.
[16:24:10] <mozmck> it shows a bunch of branches - what do I want? all of it?
[16:24:32] <cradek> a few of the branches are important, most are varying degrees of old
[16:24:54] <cradek> probably the only branch you will see a lot of new changes on is v2_3_branch
[16:25:00] <jepler> and of course "master"
[16:25:16] <cradek> that being said, I don't know the answer to your question, since I don't know what eclipse plans to do
[16:27:07] <mozmck> I don't either. It doesn't show a "master" branch, so maybe that's what it will get anyhow. I guess that's equivalent to cvs "head"?
[16:27:26] <jepler> yes
[16:28:16] <mozmck> so what happens if I tell it to get all of the branches, can I check out each branch from my local repo then?
[16:28:53] <jepler> in plain git, yes. You can switch between the branches in just a few seconds, without using the network.
[16:28:59] <mozmck> I guess git clone gets all of the branches?
[16:29:01] <cradek> you can always do that -- but I don't know the consequences of the answer you give eclipse.
[16:29:14] <mozmck> ok. I'll have to play with it.
[16:31:08] <mozmck> steve_stallings: I believe you need to boot to the kernel you will be using to compile emc for that kernel.
[16:33:39] <CIA-2> EMC: 03jepler 07master: * r61a965cee88c 10/src/ (hal/hal.h hal/halmodule.cc hal/utils/halsh.c rtapi/rtapi.h): use linux errnos instead of custom error numbers
[16:33:39] <CIA-2> EMC: 03jepler 07master: * r34d2bff6df91 10/src/ (21 files in 9 dirs): Get rid of RTAPI_SUCCESS, use 0 instead
[16:33:40] <CIA-2> EMC: 03jepler 07master: * r7b9eb0c34c99 10/src/rtapi/ (6 files): get rid of RTAPI_NOMEM
[16:33:41] <CIA-2> EMC: 03jepler 07master: * r5c6a99bd20ec 10/src/rtapi/ (sim_rtapi.c sim_ulapi.c): get rid of RTAPI_UNSUP
[16:33:43] <CIA-2> EMC: 03jepler 07master: * r397a9798184d 10/src/rtapi/ (5 files): get rid of RTAPI_BADID
[16:33:45] <CIA-2> EMC: 03jepler 07master: * rb6f8aae8727b 10/src/rtapi/ (5 files): get rid of RTAPI_INVAL
[16:33:47] <CIA-2> EMC: 03jepler 07master: * r91d1421fd544 10/src/rtapi/ (rtai_rtapi.c rtai_ulapi.c rtl_rtapi.c rtl_ulapi.c): get rid of RTAPI_LIMIT
[16:33:50] <CIA-2> EMC: 03jepler 07master: * r896e2272c289 10/src/rtapi/ (rtai_rtapi.c rtai_ulapi.c rtl_rtapi.c rtl_ulapi.c): get rid of RTAPI_BUSY
[16:33:53] <CIA-2> EMC: 03jepler 07master: * r316790834e38 10/src/rtapi/ (rtai_ulapi.c rtl_ulapi.c): get rid of RTAPI_NOTFND
[16:33:56] <CIA-2> EMC: 03jepler 07master: * rd628d9c71101 10/src/rtapi/ (5 files): get rid of RTAPI_FAIL
[16:34:00] <CIA-2> EMC: 03jepler 07master: * r93db610fa0f0 10/src/hal/utils/halcmd_commands.c: get rid of HAL_UNSUP
[16:34:03] <CIA-2> EMC: 03jepler 07master: * rac62ecdb616f 10/src/hal/utils/ (halcmd_commands.c halrmt.c): get rid of HAL_BADVAR
[16:34:08] <CIA-2> EMC: 03jepler 07master: * r31dc0db69b8b 10/src/hal/ (5 files in 2 dirs): get rid of HAL_INVAL
[16:34:10] <CIA-2> EMC: 03jepler 07master: * r9bff015262e6 10/src/hal/ (hal_lib.c utils/halcmd_commands.c): get rid of HAL_NOMEM
[16:34:13] <CIA-2> EMC: 03jepler 07master: * r497cd263a23f 10/src/hal/hal_lib.c: get rid of HAL_LIMIT
[16:34:15] <CIA-2> EMC: 03jepler 07master: * r351e5035b083 10/src/hal/ (hal_lib.c utils/halcmd_commands.c utils/halrmt.c): get rid of HAL_PERM
[16:34:18] <CIA-2> EMC: 03jepler 07master: * r0e6952196129 10/src/hal/utils/ (halcmd_commands.c halrmt.c): get rid of HAL_NOTFND
[16:34:21] <CIA-2> EMC: 03jepler 07master: * r596666ceb23a 10/src/hal/ (5 files in 2 dirs): get rid of HAL_FAIL
[16:34:27] <CIA-2> EMC: 03jepler 07master: * r158c1c64ddb5 10/src/ (25 files in 10 dirs): get rid of HAL_SUCCESS
[16:34:31] <CIA-2> EMC: 03jepler 07master: * rd005a809f46b 10/src/hal/hal.h: kill HAL_xxx error codes
[16:34:33] <CIA-2> EMC: 03jepler 07master: * r81f1d6c0fd7f 10/src/rtapi/rtapi.h: get rid of RTAPI_xxx error constants
[16:34:36] <CIA-2> EMC: 03jepler 07master: * re2231f8c5c48 10/docs/man/man3/ (intro.3hal intro.3rtapi rtapi_clock_set_period.3rtapi): got rid of error defines
[16:35:04] <cradek> jepler: looks like we need those .gitignores too
[16:35:56] <CIA-2> EMC: 03jepler 07master: * r8d29048f8c2d 10/ (186 files in 93 dirs): convert cvs ignores to git ignores
[16:35:58] <CIA-2> EMC: 03jepler 07master: * raa1e69cced3e 10/ (rtlib/.gitignore tcl/.gitignore): additional files to ignore
[16:36:15] <cradek> I love it: "(186 files in 93 dirs)"
[16:36:43] <jmkasunich> we've traded types of commit floods
[16:36:58] <cradek> heh
[16:37:11] <jmkasunich> instead of getting a flood when one change touches 50 files, we get a flood when one push contains many intermediate commits
[16:37:33] <cradek> yeah, there's one per commit. I think a big flood will be very unusual.
[16:37:34] <jepler> incidentally, I notice it's only ever the 1-line change summary, not the first few lines
[16:37:45] <cradek> that's a feature, no?
[16:37:51] <jepler> yes -- I like it
[16:38:26] <jmkasunich> I think the big floods will go away when the novelty wears off - I certainly would not have done a commit every time I removed one of those error defines - I'd just do them all
[16:38:44] <cradek> yep
[16:39:19] <cradek> hey, my first merge failure :-)
[16:39:19] <jepler> I freely admit that might be a bad use of multiple commits where one would suffice
[16:39:40] <steve_stallings> mozmck - yes, got the warning, now trying --enable-simulator
[16:40:29] <steve_stallings> ok, that goes further, but still does not generate a makefile.inc and same results as best I can tell even when booted to RTAI
[16:40:40] <cradek> fatal: You are in the middle of a conflicted merge.
[16:40:53] <steve_stallings> lots of output from configure that I need to learn to interpret
[16:41:11] <jmkasunich> cradek: are you talking to steve s, or about something else?
[16:41:25] <cradek> something else
[16:41:41] <steve_stallings> I am not getting far enough for the source code to matter 8-)
[16:41:53] <jmkasunich> steve_stallings: you could put your configure output on pastebin.ca for someone to look at
[16:42:05] <jmkasunich> (I'll look, dunno if I'll see anything)
[16:42:36] <steve_stallings> yes, I should, and I am working on that as well as many other basic skills needed to work around Linux
[16:43:24] <jepler> steve_stallings: did you build emc from source on this system before the switch?
[16:44:11] <jmkasunich> steve_stallings: pastebin.ca needs a web browser, I think you already have that skill
[16:44:47] <CIA-2> EMC: 03cradek 07master: * re21159f45c35 10/src/emc/usr_intf/halui.cc: Make halui show X,Z,W tool length offsets instead of just Z.
[16:44:48] <CIA-2> EMC: 03cradek 07master: * r6c6cc2a9ebba 10/ (232 files in 98 dirs): Merge branch 'master' of ssh://
[email protected]/git/emc2
[16:44:53] <steve_stallings> no, waited until git transition, Matt helped me prep laptop for compiles but we did not get a chance to actually do one
[16:45:46] <steve_stallings> it is raining here to day, so I will work on my skills for a while, now where is that darned USB ethernet adapter so I can get RTAI boot on the internet....
[16:46:58] <jmkasunich> steve_stallings: to be honest, in your shoes I'd focus on getting a sim build to work first
[16:48:11] <steve_stallings> I did, still didn't get make to work properly, give me a few minutes to get organized enough to post from the Linux box
[16:51:02] <CIA-2> EMC: 03 07master: * r028dd4ead3fc 10/src/ (configure configure.in): fix bold to work properly when not on a tty
[16:51:55] <jmkasunich> cradek: did you notice that the commit message for your "merge branch 'master'...." commit/push starts with "Conflicts:" ? is that something that git generated?
[16:52:23] <cradek> yes it did - I resolved a conflict in that file to allow the merge to work
[16:52:31] <cradek> (I'm a little surprised by the message too)
[16:52:40] <jepler> it automatically noted the conflicting filenames in the change message
[16:52:49] <jepler> it also makes a funky 3-way diff that I'm not entirely confident how to read
[16:52:55] <jepler> ++? -+? - ?
[16:53:20] <steve_stallings> ok, half way there, still IRC on old box but managed to post output from configure using Linux
http://www.pastebin.ca/1467752
[16:53:43] <steve_stallings> this is not -simulator but that also failed
[16:54:03] <jmkasunich> steve_stallings: "sudo apt-get install xchat-gnome"
[16:54:20] <jepler> steve_stallings: that error looks like one you see on a system where you didn't follow step 2.1.2
http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Installing_EMC2#On_Ubuntu_with_EMC2_package_already_installed
[16:54:22] <jmkasunich> we're gonna get you entirely on the new box one way or another
[16:55:12] <steve_stallings> oh, OK, but old men have only so many working brain cells, now I gotta learn xchat 8-)
[17:00:29] <jepler> whee!
[17:00:34] <CIA-2> EMC: 03jepler 07v2_3_branch * r604a8036e111 10/ (164 files in 82 dirs): convert cvs ignores to git ignores
[17:00:35] <CIA-2> EMC: 03jepler 07v2_3_branch * r81ede8d9cc7a 10/ (rtlib/.gitignore tcl/.gitignore): additional files to ignore
[17:00:36] <CIA-2> EMC: 03 07v2_3_branch * rb0c6632dc1e7 10/src/ (configure configure.in): fix bold to work properly when not on a tty
[17:01:38] <cradek> strange - why did the third one not say jepler?
[17:02:13] <jepler> cradek: I dunno, but both times I committed that fix (on master and v2_3_branch) it did the same thing. I also got 'Use of uninitialized value in concatenation (.) or string at /git/emc2.git/hooks/ciabot.pl line 192.' in both cases.
[17:02:49] <cradek> http://cia.vc/stats/project/EMC/.message/8b6395/xml
[17:03:23] <cradek> ($user) = $author =~ /<(.*?)@/;
[17:03:38] <SWPadnos> what in the hell does that mean?
[17:03:44] <cradek> ... then you have two problems
[17:04:16] <jepler> give user the part of author between < and @
[17:04:20] <jepler> the shortest part
[17:04:36] <jepler> Author: Jeff Epler <unpythonic.net>
[17:04:38] <SWPadnos> ok
[17:04:40] <jepler> weeeeiiiiirrrrrrrdddddd
[17:04:48] <jepler> one of my systems must be set up wrong?
[17:04:59] <jepler> yep, that's it
[17:05:05] <jepler> my error
[17:05:10] <jepler> sorry for the trouble :(
[17:05:30] <SWPadnos> strange. should the script check for that kind of error and use something else in that case?
[17:05:50] <SWPadnos> like whatever is before <, or between <>, or something
[17:06:17] <SWPadnos> bbl, lunch
[17:06:53] <jepler> best to just LART the people who don't properly configure their git
[17:06:55] <jepler> ow ow ow
[17:10:05] <cradek> * cradek tries valiantly to write one line of perl correctly
[17:11:00] <cradek> jepler: that should be fixed to use the full $author if it can't find something smarter
[17:13:44] <alex_joni> yay git
[17:15:49] <steves_laptop_> still in newbie mode here, does configure create makefile.inc or should it already exist?
http://pastebin.ca/1467752
[17:16:32] <jepler> steve_stallings: yes, if configure completed successfully, it would create makefile.inc
[17:16:49] <jepler> but configure has an error: you don't have development files for "glib"
[17:16:59] <jepler> so it's no use to go on with the "make" step
[17:17:24] <jepler> did you try doing step 2.1.2 from
http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Installing_EMC2#On_Ubuntu_with_EMC2_package_already_installed ?
[17:17:28] <steves_laptop_> ok, I did try to install glib, unsuccessfully, let me look again
[17:19:39] <jepler> maybe it would help to pastebin the output of the 'sudo apt-get build-dep emc2'
[17:22:16] <steves_laptop_> I would have sworn that Matt and I installed all the EMC dependencies, but apparently not, back in a few
[17:23:05] <jepler> you can install a different, smaller list of packages (apt-get install emc2-dev) if you only want to build add-on components for emc2
[17:23:09] <jepler> you need more packages to build the whole thing
[17:23:38] <jepler> is libglib-dev or the like on the list of packages it proposed? if so, you're on the right track
[17:23:41] <jepler> bbl
[17:35:05] <steves_laptop_> ok, sudo apt-get build-dep emc2, seemed to go well, but sudo apt-get install build-dep emc2 failed with E: Couldn't find package build-dep
[17:35:56] <jepler> that's a typo -- was that on the wiki?
[17:35:59] <jmkasunich> the first command should have done all that is needed
[17:36:18] <jepler> sudo apt-get build-dep emc2
[17:36:19] <jepler> sudo apt-get install build-essential
[17:36:31] <steves_laptop_> the wiki shows two lines to run in section 2.1.2
[17:36:32] <jmkasunich> apt-get build-dep <some-package) means "get everything that is needed to build <some-package>"
[17:36:46] <jmkasunich> apt-get install <some-package> means to get that package itself
[17:36:50] <jmkasunich> build-dep is not a package
[17:36:54] <jepler> build-essential is
[17:37:09] <jepler> maybe your hands were thinking too independently when you typed in the second line?
[17:37:11] <jmkasunich> build-essential is - its a meta-package that gets you the compiler and other basic stuff
[17:37:16] <steves_laptop_> ah, my mistake, cloned line and did not edit!!!
[17:38:48] <steves_laptop_> second command from wiki now says I am up to date and good to go 8-)
[17:39:03] <jepler> then try configure again
[17:39:10] <jepler> and don't bother going on to "make" if it seems to end with some kind of error
[17:39:56] <steves_laptop_> got makefile.inc, make now running
[17:41:00] <steves_laptop_> really intended to get this stuff done at the fest, but the best laid plans of mice and old men...
[17:44:13] <steves_laptop_> seems to have run, got a few warnings, see
http://pastebin.ca/1467799
[17:44:33] <cradek> pow! pow!
[17:45:38] <steves_laptop_> you talking to me, and is that good or bad?
[17:45:58] <cradek> was that build for simulator or realtime?
[17:46:04] <jepler> that looks approximately right
[17:46:17] <jepler> you have my permission to do the next step, sudo make setuid
[17:46:17] <steves_laptop_> realtime run-in-place
[17:46:23] <cradek> ah
[17:52:02] <steves_laptop_> no hardware here, but the last working ini that I created at the fest seems to work with run-in-place
[17:52:11] <jepler> cool
[17:52:23] <steves_laptop_> THANKS to all!!!!!
[17:55:45] <jepler> welcome
[18:16:15] <jepler> hm, is this important? if so, we'll have to figure out what to do about it: ./include/rtapi_common.h:static char rev[] = "$Revision$";/* magically updated by CVS */
[18:16:22] <jepler> git isn't going to make a $Revision$
[18:19:09] <jmkasunich> hmm
[18:19:28] <jmkasunich> there is probably another way to solve the problem that addresses
[18:19:47] <jmkasunich> which is making sure that comps are all using the same version of critical data structures
[18:29:11] <CIA-2> EMC: 03jepler 07master * r39c6a375a13a 10/ (11 files in 7 dirs): get rid of a lot of mentions of cvs
[18:30:37] <jmkasunich> jepler: you seem to have gotten rid of a lot more than just mentions of CVS
[18:30:55] <jmkasunich> like, the list of options that can be passed to configure
[18:31:28] <jepler> that list was out of date
[18:31:36] <jepler> the suggestion to use --help is better
[18:31:39] <jepler> I left that bit, didn't I?
[18:31:51] <cradek> yes
[18:31:53] <jepler> likewise, the suggestion to *not* use --enable-run-in-place is probably a mistake for most users, so I killed it
[18:32:03] <jepler> it wasn't really a related change, it's true
[18:32:46] <jmkasunich> I missed the --help part
[18:39:24] <CIA-2> EMC: 03jepler 07master * r777e6974a2cb 10/docs/src/ (8 files in 5 dirs): get rid of more references to cvs
[18:47:15] <steve_stallings> steve_stallings is now known as steves_logging
[18:49:28] <CIA-2> EMC: 03jepler 07v2_3_branch * r3951a192f2f5 10/ (10 files in 7 dirs): get rid of a lot of mentions of cvs
[18:49:29] <CIA-2> EMC: 03jepler 07v2_3_branch * r2ac36f78a9d3 10/docs/src/ (8 files in 5 dirs): get rid of more references to cvs
[18:49:30] <CIA-2> EMC: 03jepler 07v2_3_branch * r7aae7b357b11 10/tests/overrun/ (checkresult test.hal test.sh xfail): make a proper test for overruns, instead of an "expected to fail" test
[19:59:21] <BigJohnT> is the sandbox still working?
[19:59:49] <BigJohnT> I get "fatal: The remote end hung up enexpectedly" after a pull
[20:01:09] <BigJohnT> or is that because I did a git clone git://... instead of a git clone ssh:/...
[20:01:27] <cradek> no, the sandbox is gone
[20:01:37] <BigJohnT> ok
[20:01:47] <cradek> those error messages suck
[20:02:03] <BigJohnT> yes they do
[20:09:35] <jepler> BigJohnT: unlike the change from experimental -> sandbox, I don't think there's a way to switch short of doing a full download
[20:11:07] <BigJohnT> ok, thanks
[20:11:24] <BigJohnT> I just had the slap on the forhead moment with git branches
[20:11:31] <jepler> oh?
[20:11:59] <BigJohnT> I checked out 2.3 then opened a file and edited it then commited it
[20:12:28] <jepler> "git branch" will show you the branch you're on
[20:12:30] <BigJohnT> then I switched to master and opened the same file up and it was as I edited it while in master
[20:12:56] <BigJohnT> I couldn't figure out for a while where the 2.3 branch was :)
[20:13:11] <BigJohnT> it's magic I think
[20:13:41] <mozmck> so editing for one branch changed it in others?
[20:13:52] <BigJohnT> no
[20:17:20] <mozmck> oh, I see what you're saying...
[20:18:32] <BigJohnT> there is a way to update the branch from the master but it excapes me at the moment
[20:20:10] <alex_joni> if you want one change, then you can git cherry-pick
[20:20:16] <cradek> in gitk, you can right click on the change you want, and "cherry pick" it. That will make the same change on your current branch.
[20:20:25] <alex_joni> make the change on master, go to the branch, then cherry pick it
[20:20:42] <cradek> then, you can "git push --all" to share the whole works at once
[20:20:51] <BigJohnT> cool
[20:25:21] <BigJohnT> you can get to gitk from git gui that is cool
[20:26:16] <BigJohnT> ok, cool that works easy
[20:28:44] <BigJohnT> so now I think it is better to use lyx 1.53 :0
[20:28:51] <BigJohnT> * BigJohnT runs and hides
[20:59:18] <BigJohnT> I can be in master, open a file, checkout branch, open the same file up and I have the master and the branch open... it's magic :)
[21:22:09] <jepler> I wouldn't bet that "cherry pick" will work right if one version of the document is written in new lyx and one in old lyx
[21:22:16] <jepler> they move all the words around, break lines differently, use different codes
[21:22:19] <jepler> it won't work automatically
[22:02:43] <BigJohnT> jepler: once you open both up in 1.53 and save them there should not be a problem right?
[22:04:11] <jepler> BigJohnT: we still can't do 1.53 for v2_3_branch, I didn't work that much magic
[22:04:33] <BigJohnT> ok
[22:07:16] <BigJohnT> jepler: is that because of Ubuntu 6.06?
[22:47:28] <jepler> BigJohnT: right
[22:56:03] <BigJohnT> jepler: if it is not too much trouble can you revert it so I can do master docs with lyx 1.53 and 2.3 docs with lyx 1.3.7
[23:10:47] <jepler> BigJohnT: if you like, yes. hold on...
[23:20:29] <CIA-2> EMC: 03jepler 07master * r2570159b855e 10/src/ (configure configure.in): switch to lyx 1.5.x for documentation
[23:20:31] <jepler> BigJohnT: I think that does it.. holler if you're not satisfied.
[23:37:11] <BigJohnT> jepler: thanks
[23:47:48] <cradek> jepler: thanks for doing the wiki work. looks like a huge list.
[23:53:22] <jepler> cradek: I hope I didn't mangle the pages too badly
[23:53:23] <jepler> dinnertime!