Timestamps are in GMT/BST.
| 00:34:36 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 00:39:09 | | Flynnn has joined |
| 01:04:38 | | Darrel Quit (Read error: Connection reset by peer) |
| 01:05:09 | | Darrel has joined |
| 01:10:55 | | Guest17386 Quit (Quit: Guest17386) |
| 01:17:31 | | kaen_mbp Quit (Remote host closed the connection) |
| 01:35:12 | | BFLogBot Commit: 5e3c7a00fc | Author: buckyballreaction | Message: Pull out OpenGL includes into it's own header file. This will make it easier to manage different GL APIs |
| 01:35:13 | | BFLogBot Commit: 923417f510 | Author: buckyballreaction | Message: Clean-up stale reference to freeglut |
| 01:35:20 | raptor | look! I did some code! |
| 01:41:39 | raptor | night! |
| 01:45:24 | | raptor Quit () |
| 02:18:04 | | kaen_mbp has joined |
| 02:22:46 | | kaen_mbp Quit (Ping timeout: 256 seconds) |
| 04:11:18 | | kaen_mbp has joined |
| 04:15:42 | | kaen_mbp Quit (Ping timeout: 246 seconds) |
| 05:34:09 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 06:12:46 | | kaen_mbp has joined |
| 06:17:16 | | kaen_mbp Quit (Ping timeout: 265 seconds) |
| 07:39:30 | | LordDVG has joined |
| 07:56:17 | | LordDVG Quit (Remote host closed the connection) |
| 08:14:14 | | kaen_mbp has joined |
| 08:18:40 | | kaen_mbp Quit (Ping timeout: 244 seconds) |
| 09:04:40 | | koda has joined |
| 10:15:34 | | kaen_mbp has joined |
| 10:19:54 | | kaen_mbp Quit (Ping timeout: 256 seconds) |
| 10:24:18 | | koda Quit (Quit: koda) |
| 10:41:00 | | koda has joined |
| 10:55:23 | | Darrel Quit (Read error: Connection reset by peer) |
| 10:56:20 | | Darrel has joined |
| 12:01:57 | | raptor has joined |
| 12:01:57 | | ChanServ sets mode +o |
| 12:02:03 | raptor | good morning! |
| 12:17:30 | | kaen_mbp has joined |
| 12:22:11 | | kaen_mbp Quit (Ping timeout: 265 seconds) |
| 12:39:21 | | kaen_mbp has joined |
| 12:55:08 | | Flynnn has joined |
| 13:29:00 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 13:32:57 | watusimoto | man. |
| 13:33:35 | watusimoto | I sat down to read a chapter of this spy-thriller I got from the library... I looked up and it was 2AM. I read maybe half a page |
| 13:33:45 | watusimoto | I wasn't even feeling sleepy |
| 13:36:27 | watusimoto | google code is shutting down... |
| 13:44:51 | koda | \o/ |
| 13:45:47 | | Flynnn has joined |
| 13:45:49 | | Flynnn Quit (Remote host closed the connection) |
| 13:50:24 | | LordDVG has joined |
| 14:23:10 | | LordDVG Quit (Remote host closed the connection) |
| 14:27:17 | raptor | hi watusimoto |
| 14:28:06 | raptor | koda: what are we going to do !?!? Googley is shutting down our repos! |
| 14:28:20 | koda | well i had a github repo long set up before that |
| 14:28:30 | koda | secondly there is an export tool |
| 14:28:37 | koda | thirdly it was about time :p |
| 14:28:50 | raptor | but it's GIT! |
| 14:28:57 | raptor | i can still use hg-git, i suppose |
| 14:30:16 | raptor | sourceforge does hg, doesn't it? |
| 14:30:31 | raptor | all our commit message references will be broke |
| 14:31:32 | koda | i reeeeely don't recommend sourceforge is hg is your problem |
| 14:31:43 | koda | bitbucket is hg |
| 14:31:53 | raptor | oh yeah, bitbucket... |
| 14:31:58 | koda | and hg->git should have a hash map option |
| 14:32:26 | raptor | you guys are definitely going to github, then? |
| 14:45:31 | koda | probably not |
| 14:45:37 | koda | i am the only git lover there :p |
| 14:47:18 | raptor | wait wait... |
| 14:47:31 | raptor | was that a sarcastic comment? |
| 14:47:37 | raptor | can't tell in iRC.. |
| 14:52:55 | koda | no really |
| 14:53:02 | koda | try mentioning that to nemo |
| 14:53:09 | koda | he'll bite you |
| 14:53:30 | raptor | i thought one of you was the pro-hg/anti-git guy... it's nemo? |
| 14:53:38 | watusimoto | just say no to sourceforge |
| 14:53:45 | raptor | hi watusimoto |
| 14:53:50 | raptor | we're gettin' the boot! |
| 14:54:39 | watusimoto | you can use hg on bitbucket |
| 14:55:05 | watusimoto | I see that koda has already mentioned all my points |
| 14:55:33 | watusimoto | at my last job, I chose to use bitbucket for one project, and github for anoher, mostly to compare |
| 14:55:46 | raptor | what was your analysis? |
| 14:56:01 | watusimoto | I didn;t really interact with the bitbucket project enough to know for sure, but thier requirements for free service were different |
| 14:56:11 | watusimoto | at github, you pay for a private repo, so we'd be free |
| 14:56:30 | watusimoto | at bitbucket, I think the threshold for paying is > 5 developers, but you can be private for free |
| 14:56:40 | watusimoto | that would suggest github is a better fit |
| 14:56:57 | raptor | hmm... interesting... maybe we could also just roll our own hg server like SDL |
| 14:57:13 | watusimoto | we could do that |
| 14:57:23 | watusimoto | but it's another thing to maintain |
| 14:57:39 | raptor | ... not as easy to accept contributions |
| 14:57:43 | koda | btw guys have you got some bandwidth to spare? |
| 14:57:45 | watusimoto | we should put all our web code into a repo |
| 14:57:56 | watusimoto | we have sufficient bandwidth |
| 14:58:08 | raptor | koda: do you need us to host hedgewars files? |
| 14:58:10 | raptor | :) |
| 14:58:19 | koda | no, but the server where hedgewars is located is closing and we don't have any replacement |
| 14:58:29 | koda | so we'd need hosting fellas :) |
| 14:58:39 | watusimoto | you mean where your website and game servers are? |
| 14:58:47 | koda | only the gameserver |
| 14:58:55 | raptor | oh... your master |
| 14:58:58 | watusimoto | I would recommend getting a cheap vps |
| 14:59:09 | watusimoto | we are paying $3.50 or so per month for bitfighter.org |
| 14:59:22 | watusimoto | web hosting, master server, and a game server |
| 15:00:16 | watusimoto | I found mine here: |
| 15:00:17 | watusimoto | http://lowendbox.com/ |
| 15:00:39 | watusimoto | I actually have several... they're so cheap I think I've forgotten a couple |
| 15:01:23 | raptor | looks like github is definitely better for collaboration... |
| 15:01:42 | watusimoto | yes -- I think that absent any compelling reason not to, that is where we're headed |
| 15:02:08 | raptor | and you know I don't like git, but I'd be willing to move to it and use hg-git. It doesn't look like there are a lot of alternatives :) |
| 15:02:45 | raptor | then we get to edit history and backstab any downstream repos! |
| 15:04:06 | watusimoto | there's codeplex... they support mercurial |
| 15:04:19 | raptor | isn't that microsoft? |
| 15:04:26 | watusimoto | it is |
| 15:05:12 | watusimoto | http://en.wikipedia.org/wiki/Comparison_of_source_code_software_hosting_facilities |
| 15:06:03 | raptor | can't find user limits... |
| 15:06:17 | raptor | also, i wonder if the bitbucket limit is only for private repos? |
| 15:07:08 | watusimoto | or gitlab |
| 15:07:14 | watusimoto | bitbucket may have changed |
| 15:08:08 | watusimoto | https://gist.github.com/foogit/8410710 |
| 15:08:12 | watusimoto | --> pricing and plans |
| 15:09:42 | watusimoto | http://i.imgur.com/D0osPIz.png |
| 15:09:48 | watusimoto | direct from the site |
| 15:09:55 | watusimoto | (the bitbucket site) |
| 15:11:09 | raptor | we're not academic... |
| 15:11:11 | raptor | sadly |
| 15:11:17 | raptor | or are we? :) |
| 15:11:22 | watusimoto | you might be! |
| 15:17:19 | watusimoto | github supports svn... |
| 15:17:21 | raptor | ah ha!: https://confluence.atlassian.com/display/BITBUCKET/Plans+and+billing |
| 15:17:29 | raptor | public repos are unlimited |
| 15:17:50 | watusimoto | ah so! |
| 15:19:22 | raptor | looks like bitbucket has improved again... |
| 15:23:44 | watusimoto | I guess google isn't gong to fix your bookmark issue |
| 15:23:54 | raptor | hah, i doubt it |
| 15:24:34 | watusimoto | so I'm thinking we migrate to github |
| 15:25:07 | watusimoto | it seems to be the most visible location |
| 15:25:21 | watusimoto | not excited to switch to git |
| 15:25:30 | raptor | you can use hg-git |
| 15:25:34 | watusimoto | but that's where I;m at right now |
| 15:25:38 | raptor | it's what i'm planning on doing |
| 15:25:48 | watusimoto | 99% of stuff I do is from the gui |
| 15:25:55 | watusimoto | so I'd probably get a git gui |
| 15:26:04 | watusimoto | bye-bye, tortoise :-( |
| 15:26:20 | raptor | so you'd still chose github even though bitbucket allows unlimited public repos? |
| 15:26:25 | raptor | (just to verify) |
| 15:26:33 | watusimoto | yes |
| 15:27:08 | watusimoto | but I'm intersted in opposing views |
| 15:27:17 | watusimoto | or rather, other viewpioints |
| 15:27:41 | raptor | i like the public-ness of github, but i don't like git - i consider it a definite disability to people new to version control |
| 15:28:12 | raptor | but maybe using github's GUI reduces that: https://windows.github.com/ |
| 15:30:46 | raptor | I've actually done a couple github repos using HG instead with this: http://hg-git.github.io/ |
| 15:32:14 | raptor | once you get past the initial set-up, you just use tortoise or 'hg' command like normal from then on out |
| 15:32:43 | raptor | I have 4 github repos to my name, and 3 of them I run with 'hg' isntead |
| 15:33:01 | raptor | so that is one way of adapting... |
| 15:38:29 | koda | raptor: "onsider it a definite disability to people new to version control" :|:|:| |
| 15:38:47 | koda | git stopms hg feature and speed wise |
| 15:38:58 | koda | i can understand the more complex syntax |
| 15:39:09 | koda | but calling it a disability isn't it a bit extreme? |
| 15:40:16 | watusimoto | their gui is not very good |
| 15:40:24 | watusimoto | I tried using it for a project with my kids |
| 15:40:36 | watusimoto | and I didn't like it |
| 15:40:40 | koda | *any* gui sucks |
| 15:40:46 | watusimoto | no!!!!! |
| 15:40:54 | koda | unless done by apple |
| 15:40:54 | koda | :D |
| 15:40:57 | watusimoto | ha |
| 15:41:24 | watusimoto | git is just weird |
| 15:41:29 | watusimoto | it feels very cobbled together |
| 15:41:46 | koda | i guess i disagree |
| 15:41:47 | watusimoto | and I use the word together very lightly |
| 15:41:55 | watusimoto | it mostly feels cobbled |
| 15:42:08 | koda | hg seems random |
| 15:42:12 | koda | in a lot of things it does |
| 15:42:19 | watusimoto | how do you revert in git? |
| 15:42:22 | watusimoto | git revert? |
| 15:42:24 | watusimoto | no |
| 15:42:27 | watusimoto | git checkout |
| 15:42:29 | watusimoto | or something |
| 15:42:40 | koda | git reset --hard HEAD |
| 15:42:41 | koda | ~ |
| 15:42:47 | watusimoto | yeah... weird |
| 15:43:16 | koda | how do you revert two revisions in git? |
| 15:43:18 | koda | git reset --hard HEAD~~ |
| 15:43:22 | koda | in hg? YOU CAN'T |
| 15:43:28 | koda | eod for me :p |
| 15:43:44 | watusimoto | hg revert <revision number>? |
| 15:43:53 | watusimoto | (I only use gui, so it's simple there) |
| 15:53:04 | raptor | it's funny, i thought koda was pro-hg, and here he is battling watusimoto who I thought was pro-git |
| 15:53:24 | koda | raptor: we switched nicks and you didn't notice |
| 15:53:38 | koda | but true, originally i was very anti git |
| 15:53:49 | raptor | i think i need to meet you guys in real life one of these years... |
| 15:53:57 | raptor | that way I'm not always guessing in IRC |
| 15:58:08 | raptor | 'cobbled' is an excellent word to describe git |
| 15:59:25 | raptor | but doubt we could beat the visibility of github... unless it's declining already? It has to sometime I figure... |
| 16:29:47 | | koda Quit (Quit: koda) |
| 17:00:19 | watusimoto | I am not pro git |
| 17:00:45 | watusimoto | just to be clear |
| 17:00:53 | watusimoto | I don't really like it at all |
| 17:02:40 | raptor | my experience is that hg-git works well, although I'm not sure how to set it up on windows... |
| 17:02:52 | raptor | oh wait! |
| 17:03:06 | raptor | tortoise comes with it preinstalled!: http://tortoisehg.readthedocs.org/en/latest/nonhg.html#hg-git-git |
| 17:03:24 | raptor | you just need to enable it and then check out your repo |
| 17:03:32 | | raptor has left #bitfighter |
| 17:03:35 | | raptor has joined |
| 17:03:38 | | ChanServ sets mode +o |
| 17:13:04 | | Flynnn has joined |
| 17:40:33 | raptor | back later... |
| 17:40:39 | | raptor Quit () |
| 17:57:15 | | kaen_mbp Quit (Remote host closed the connection) |
| 18:14:37 | | Hutch has joined |
| 18:23:30 | | Hutch Quit (Quit: Page closed) |
| 18:27:44 | | kaen_mbp has joined |
| 18:34:37 | | kaen_mbp Quit (Ping timeout: 256 seconds) |
| 19:46:21 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 19:55:17 | | watusimoto has left #bitfighter |
| 19:58:43 | | Flynnn has joined |
| 20:31:15 | | kaen_mbp has joined |
| 20:35:31 | | kaen_mbp Quit (Ping timeout: 252 seconds) |
| 21:13:20 | | raptor has joined |
| 21:13:20 | | ChanServ sets mode +o |
| 21:40:26 | | Flynnn Quit (Ping timeout: 265 seconds) |
| 21:50:36 | | Flynnn has joined |
| 22:32:37 | | kaen_mbp has joined |
| 22:37:28 | | kaen_mbp Quit (Ping timeout: 265 seconds) |