#nuvie@irc.freenode.net logs for 17 Feb 2011 (GMT)

Archive Today Yesterday Tomorrow
Nuvie homepage


[03:27:41] <-- servus has left IRC (Ping timeout: 264 seconds)
[03:30:03] --> servus has joined #nuvie
[03:42:53] <-- servus has left IRC (Ping timeout: 240 seconds)
[03:47:03] --> servus has joined #nuvie
[05:27:41] <-- servus has left IRC (Ping timeout: 264 seconds)
[05:31:48] --> servus has joined #nuvie
[06:10:29] <-- servus has left IRC (Ping timeout: 240 seconds)
[07:33:09] --> Yuv422 has joined #nuvie
[08:01:18] --> servus has joined #nuvie
[08:27:24] <-- Yuv422 has left IRC (Quit: Yuv422)
[09:06:19] --> Yuv422 has joined #nuvie
[09:24:05] <-- Yuv422 has left IRC (Ping timeout: 240 seconds)
[10:17:09] --> Yuv422 has joined #nuvie
[10:20:32] --> Dominus has joined #nuvie
[10:24:25] <Dominus> Yuv422: I suggest you merge the branch with the trunk and let kirben do his snapshot work on the branch... it's far too interesting for everybody
[10:24:52] <Yuv422> :-)
[10:25:09] <Yuv422> you're probably right
[10:25:29] <Yuv422> I'm suffering from the "I'll just add a little more" syndrome
[10:29:41] <Yuv422> It's going to be one big changelog entry
[10:42:09] <Dominus> yes :)
[10:42:46] <Dominus> but as you are only working on the branch now anyway you can make it the trunk, imo
[10:49:35] <-- Dominus has left IRC (Quit: Leaving.)
[11:06:11] <Yuv422> merging branches takes forever
[11:14:53] <wjp> we should switch nuvie to git :-)
[11:23:57] <Yuv422> :)
[11:24:18] <Yuv422> How is git support for OS X these days?
[11:26:13] <wjp> AFAIK the regular command line version should work fine. Don't have any experience with GUIs
[11:26:42] <Yuv422> yeah I use svn via commandline
[11:26:47] <Yuv422> so that wouldn't be a prob
[11:27:27] <Yuv422> I'm just hacking up the svn log for the brach
[11:27:30] <Yuv422> branch
[11:27:38] <Yuv422> so I can put it into the changelog
[11:27:40] <Yuv422> file
[11:56:00] <Yuv422> incoming merge!
[12:00:16] <Yuv422> wow a lot has changed when you look at it as a single commit
[12:01:10] <CIA-45> nuvie: 03efry * r1143 10/nuvie/trunk/ (192 files in 20 dirs): Merged ERIC_SCRIPTING_2_BRANCH 1076:1142 into trunk
[12:04:28] <Yuv422> Kirben: Could you make a new snapshot from the trunk when you have time
[12:13:54] <Yuv422> I'm off now
[12:13:55] <Yuv422> cya
[12:13:57] <-- Yuv422 has left IRC (Quit: Yuv422)
[12:26:32] <CIA-45> nuvie: 03Kirben * r1144 10/nuvie/trunk/ (Makefile.mingw sound/mixer/doublebuffersdl-mixer.h): Fix mingw compilation.
[13:25:01] <-- Kirben has left IRC ()
[18:10:27] --> Dominus has joined #nuvie
[19:03:28] <Dominus> wow, yuv422, great
[19:03:41] <Dominus> I didn't expect you'd merge right away
[19:04:06] <Dominus> and wjp, don't think I didn't see you mentioning evil git!!! :)
[19:04:35] <Dominus> (I'm like a medieval peasant - what I don't understand equals evil)
[20:07:05] --> Yuv422 has joined #nuvie
[20:09:05] <Yuv422> Dominus: I'm going to be away for a couple of weeks so I thought I might as well push what I've done thus far back into the trunk
[20:11:03] <Yuv422> I might continue to work on my dev branch
[20:11:14] <Yuv422> and merge more changes a bit later on
[20:11:48] <Yuv422> but the current trunk should contain a big set of new features for people to play around with
[20:21:39] <Dominus> I see, makes sense
[20:22:20] <Dominus> I've told some of it to kenneth of Ultima Aiera and the Fm Towns sfx and speech addition made him very excited
[20:22:32] <Dominus> he will probably tell about it on his site soonish
[20:31:41] <Yuv422> hehe
[20:31:45] <Yuv422> cool
[20:32:10] <wjp> Dominus: what's wrong with git? :-)
[20:34:14] <Yuv422> git is on my "to look at" pile
[20:34:40] <Yuv422> It's getting a lot of traction these days
[20:37:07] <Dominus> wjp, as I wrote before on #scummvm, I just don't get git and when you people talk about it over there... I get it even less :)
[20:37:36] <Dominus> though I'm sure I would get used to it if Exult were to use it :)
[20:38:01] <Yuv422> are there plans to convert exult over to git? ;-)
[20:38:16] <Dominus> it's just the initial "wtf" moment each time I'm forced to change my behavior :)
[20:38:24] <Dominus> Yuv422: not that I know of :)
[20:43:05] <Dominus> sleepy time, good night
[20:43:15] <Yuv422> cya
[20:43:23] <-- Dominus has left IRC (Quit: Leaving.)
[21:45:13] <-- Yuv422 has left IRC (Quit: Yuv422)
[23:05:09] --> Kirben has joined #nuvie