Thursday, Sep 2nd (2010)
[03:01] animate1978 (~animate19@66-188-118-154.dhcp.mdsn.wi.charter.com) joined #aqsis.
[10:09] qazwsx (kvirc@92.10.19.31) joined #aqsis.
[10:22] renderguy (~renderguy@81.145.160.18) joined #aqsis.
[10:22] <renderguy> Morning all.
[10:22] renderguy curses Git.
[10:25] <qazwsx> I never understood how git differs from other version control things, like subversion...
[10:36] <pgregory> qazwsx: it's distributed.
[10:36] <pgregory> renderguy: what's wrong with git?
[10:38] <renderguy> pgregory: My lack of knowledge really, as I don't spend much time with it, I made 2 commits locally but only my last one seems to have been pushed to our "master".
[10:38] <pgregory> did you push?
[10:39] <renderguy> pgregory: Running "git status" locally tells me there are no further changes, looks like I'll have to redo the first (local) commit again.
[10:39] <renderguy> pgregory: ^^ Yep.
[10:39] <pgregory> run git log to see whether your change was really committed locally
[10:40] <pgregory> git doesn't make mistakes like this, so I'm afraid it has to be operator error.
[10:40] <renderguy> pgregory: No need to be "afraid", I have thicker skin than that. ;-)
[10:41] <pgregory> paste your git log output, or at least the first few commits, and I'll take a look with you.
[10:41] <renderguy> Doh!
[10:42] <renderguy> pgregory: Sorry, it did push my other commit, it was just further behind Chris' than I realised. :-s
[10:45] <renderguy> pgregory: For reference, I've just committed/finished the "documentation" target in CMake (enabled by default)... which makes the automated builds a little easier too.
[10:46] <renderguy> pgregory: I can now get back to migrating the content from the wiki.
[10:50] <renderguy> pgregory: My doc target (CMake) is a little ugly, could/should be converted into a macro at some point, but it works.
[10:53] <pgregory> well done
[11:01] <renderguy> pgregory: The automation's pretty nice now, have you looked at http://doc.aqsis.orgf recently?
[11:04] renderguy is enjoying Sphinx.
[11:09] <pgregory> renderguy: "Aqsis Developer Manual" might not be the best name
[11:10] <pgregory> something like "Aqsis Developer Reference" would be better
[11:11] <renderguy> pgregory: You mean for the Doxygen content?
[11:11] <pgregory> yeah
[11:11] renderguy was wondering what to call that.
[11:12] <pgregory> it's a reference rather than a manual
[11:12] <renderguy> pgregory: Fully agree, the name escaped me at the time.
[11:13] <renderguy> pgregory: Done.
[11:14] <renderguy> Didn't fancy sharing a tent with Dan or Anthony then? ;-)
[11:14] <pgregory> ?
[11:14] <renderguy> Doh! wrong window. :-s
[11:15] <pgregory> renderguy: top priority is to get all the Sphinx pages looking the same.
[11:15] <pgregory> IMHO
[11:15] c42f (~foster@110-175-124-119.tpgi.com.au) joined #aqsis.
[11:17] <c42f> Hi all
[11:19] <renderguy> c42f: Morning Committ-man.
[11:20] <c42f> heh
[11:20] <c42f> Hi Leon
[11:21] <renderguy> pgregory: I'm happy to look at the template stuff first/during... I actually quite like their "default" (Python) template.
[11:22] <pgregory> I think whatever we go with, we a) need some control, that's why I put a css/template in place, and b) it all needs to be the same, as a priority.
[11:22] <pgregory> we need control, because Sphinx is designed for produceing reference (Doxygen) docs, and so the default stuff won't always fit.
[11:22] <pgregory> as an example, I needed to modify the search template because it said something like "enter a search term, module or function name"
[11:23] <pgregory> which doesn't make any sense in a user manual.
[11:23] <pgregory> hi Chris
[11:24] <renderguy> pgregory: Fair comment(s), I'll work on that next then.
[11:32] <c42f> hi Paul
[11:34] <renderguy> c42f: Quick Git question, what process (commands) do you use before pushing multiple commits from your local repo to the "master"?
[11:35] renderguy noticed an automated "Merge Branch" commit from his latest push.
[11:39] |rt| (~realthing@68-116-198-0.dhcp.oxfr.ma.charter.com) joined #aqsis.
[12:01] <c42f> oh yuck
[12:01] <c42f> renderguy: To avoid those ugly loops in the history...
[12:02] <c42f> you should avoid "git pull"
[12:02] <c42f> because that automatically does "git fetch" (to download from the server) followed by "git merge"
[12:03] <c42f> Instead, if you want the history to be nice and linear, it suffices to do
[12:03] <c42f> "git fetch" followed by "git rebase origin/master"
[12:03] <c42f> The rebase will stick your commits to the end of the public tree, origin/master
[12:05] <c42f> I find the GUI (gitk) very very helpful to visualize what I'm doing to the history DAG
[12:06] <c42f> (Note that rebase screws with the history, so you should only ever do this for commits which you haven't pushed yet!)
[12:06] <c42f> renderguy: make sense?
[12:07] <renderguy> renderguy: K, don't use "git pull", that's where I was going wrong... makes sense, thanks!
[12:08] <c42f> cool
[12:09] <renderguy> c42f: The GUI is not an ideal option, as I tend to do my work via a terminal session, but "fetch" and "rebase" is easy to remember. ;-)
[12:09] <renderguy> c42f: Kudos on the merge BTW.
[12:11] <c42f> thanks
[12:11] <c42f> BTW, I'm not saying I use the GUI to actually do merges or anything. I just use it to visualize what I'm about to do to the history
[12:12] <renderguy> c42f: Looks like you'll beat me on the commits this week. ;-)
[12:12] renderguy chuckles at his new game.
[12:13] <renderguy> c42f: ^^ That no-doubt makes sense for your commits, mine should be much smaller (and simpler).
[12:16] <renderguy> c42f: I believe it's 3:1 to you at the moment (Australia:UK), might have to bring-in pgregory from the bench. :-)
[12:17] renderguy notes 2 vs. 1 is unfair, so will use a tag-team approach.
[12:20] <c42f> haha
[12:20] <renderguy> c42f & pgregory: Before you ask, "Yes", this is a daft game I came-up with to a) Amuse myself, b) Challenge myself and c) benefit Aqsis.
[12:21] <c42f> Well, I'm almost back to thinking about the hard stuff again, so maybe it should be a bit more even.
[12:22] <c42f> I just looked at my ohloh commit log. August was a nice flurry of activity... probably because the renderer interface stuff is relatively easy
[12:22] <c42f> that's mostly done though
[12:22] <renderguy> c42f: Might be able to claw-it-back during that time, we're not relegated yet.
[12:24] <renderguy> BIAB
[12:29] <c42f> renderguy: btw, thought I should point out that you can always use "git pull" if you haven't comitted anything locally. That never results in a merge of course.
[12:34] pgregory just had to read the history a few times, thought he'd returned to face some weird alternate universe.
[12:34] pgregory bought himself a new macbook this week, from the proceeds of the Radiant job, very nice, totally taken with it.
[12:43] <c42f> neat. What was the radient job again?
[12:44] <pgregory> the FIFA and UEFA football stuff for TV coverage.
[12:44] <pgregory> building a nice interface for the HD delivered with all the content on it.
[12:44] <pgregory> I have a quite functional toolkit now, which I'm still working on, for putting together very flexible and good looking OpenGL based interfaces.
[12:45] c42f must have forgotten about that. Sounds pretty fancy :)
[12:45] <pgregory> it has state machines, animation with smoothing curves etc.
[12:45] <pgregory> It was something that came out of my last job at Rushes.
[12:45] <c42f> right
[12:45] <pgregory> Rushes did the 3D GFX for the Champions League TV coverage in 2009/10, for Radiant.
[12:46] <pgregory> when I was made redundant, Rushes passed my name onto Radiant as someone who might be able to put together a nice interface.
[12:46] <c42f> So it was freelance essentially?
[12:47] <pgregory> the content is delivered to the TV studios on a 320Gb LaCie drive, lots of hi-def content, animations for use during ad-breaks, program announcements, and during the game (score, player introduction, etc.)
[12:48] <pgregory> they didn't want the studio people to have to search the disk with explorer to find what they wanted, so they paid me to make a nice DVD style interface (although far more fancy than a DVD), so they can see the content, and choose what they wanted to download to their local systems.
[12:48] <c42f> ah, I see.
[12:49] <pgregory> it went well, and this year, they got back to me asking me to do the same sort of thing, but with very different branding of course, for the FIFA World Cup, the UEFA Champions League 2010/11 and the Europa Cup.
[12:49] <pgregory> they tell me there is a very high chance the work will continue, at least for the next couple of years.
[12:50] <pgregory> I've cleared it with GLU, so now I've spent some time making the toolkit better and easier to configure (most of my time this time round was entering the data).
[12:50] <pgregory> makes for some handy extra income.
[12:50] <pgregory> it basically paid for our holiday this year.
[12:50] <c42f> wow, that's great :)
[12:51] <pgregory> I've started registration as self employed now, for tax purposes, operating under the name "Indigo Beetle Consulting"
[12:52] <pgregory> my old PPC iMac was struggling a bit, so I decided to splash out on a MacBook to do it properly.
[12:52] <pgregory> I have vision that the toolkit, once complete, could be used for other projects.
[12:52] <pgregory> it's very flexible, XML configured, scriptable with Lua.
[12:54] <c42f> Our latest gadget is an eeepc which we bought for my wife to lecture with. They're fun little machines.
[12:55] <pgregory> yep, I've just had to donate my old EeePC to Leah
[12:56] <pgregory> when she saw my new MacBook she got all excited that she could have the old iMac, but Michelle is worried about her having a Mac and learning with Windows at schoold, worried it might confuse her.
[12:56] <c42f> haha. Surely she would be ok...
[12:56] <pgregory> so she got upset, and I said she could have the eee to make up for it, which cheered her up no end.
[12:57] <pgregory> I think so, in fact I think it would be good to learn multiple systems while she's so accepting of new things.
[12:57] <pgregory> but to be honest, the eee is better suited to her anway.
[12:57] <pgregory> I had good use out of it, used it on the train a lot when I was travelling to London 3-4 days a week.
[12:57] <pgregory> not so much now, only travel 1 day, so it's a bit wasted, good if Leah gets some value out of it.
[12:58] <pgregory> what does your eee run? Linux?
[12:58] <c42f> Yeah, we put Ubuntu on our eee. I wasn't allowed to downsize the windows partition, but I haven't seen Vivien boot windows on it for weeks now :)
[12:59] <pgregory> I had Ubuntu on mine for ages, but eventually switched to XP mainly to make it more usable for Michelle and Leah.
[13:00] <c42f> Well Viv spends a lot of time in cygwin anyway so I think she's probably enjoying finally being on a real unix system.
[13:00] <pgregory> did anyone get any time to look at cortex yet?
[13:01] <pgregory> jumping topic suddenly.
[13:01] <c42f> Not really. I've had a peek at parts in the past
[13:01] <pgregory> looks nice
[13:01] <pgregory> not sure it's what I want for the GUI, but it is nice.
[13:01] <pgregory> would be worth getting it building with Aqsis, I'll try and find some time to do that later.
[13:02] <c42f> Yeah cool
[13:40] renderguy returns.
[13:42] <renderguy> pgregory: Ah, I was wondering what happened to your UEFA work, kudos.
[13:42] renderguy was tempted by an iPad recently.
[13:42] <renderguy> pgregory: I guess you're running Snow Leopard too?
[13:47] <pgregory> renderguy: yes
[13:48] <renderguy> pgregory: Excellent, may make sanity-checking a little easier.
[13:49] <c42f> 'night guys
[13:49] c42f (~foster@110-175-124-119.tpgi.com.au) left irc: Quit: leaving
[15:05] nitrospectide (~nitrospec@nj-76-6-33-133.dhcp.embarqhsd.net) joined #aqsis.
[15:05] nitrospectide (~nitrospec@nj-76-6-33-133.dhcp.embarqhsd.net) left irc: Excess Flood
[15:06] nitrospectide (~nitrospec@nj-76-6-33-133.dhcp.embarqhsd.net) joined #aqsis.
[15:10] qazwsx (kvirc@92.10.19.31) left irc: Read error: Connection reset by peer
[17:08] <renderguy> Gotta shoot now, laterz.
[17:09] renderguy (renderguy@81.145.160.18) left #aqsis.