| 00:00.06 | allejo | the 22 |
| 00:00.09 | allejo | so tuesday |
| 00:00.30 | JeffM | did you build it on 10.9 or just run our bin? |
| 00:00.54 | allejo | at the moment just running the binary, haven't gotten around to building it |
| 00:01.04 | JeffM | wonder what they changed this time |
| 00:01.39 | blast007 | a one to a zero |
| 00:02.20 | JeffM | I planned on buying it but I'm not a paying developer so I can't try it till it shipps |
| 00:02.20 | blast007 | our 2.4.2 bin for OSX was a stripped binary, right? |
| 00:02.34 | JeffM | yeah it wasn't 109 megs |
| 00:02.38 | blast007 | :) |
| 01:50.05 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 01:50.07 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 03:07.38 | BulletCatcher | The bzflag-import-2 repo on GitHub is the best place for authorized committers. |
| 03:07.39 | BulletCatcher | Push requests should go with the others on the bzflag repo. |
| 03:07.50 | BulletCatcher | Yes, it's confusing and complicated. |
| 03:08.02 | BulletCatcher | ... the way Git is meant to be. |
| 03:11.43 | blast007 | so is the bzflag-import-2 not a complete migration? I only see branches for 2.4 and 2.6, and only tags for 2.4.0 and 2.4.2 |
| 03:12.39 | BulletCatcher | Correct. |
| 03:12.40 | BulletCatcher | It will take quite a bit more work to import the older commits into clean branches. |
| 03:15.07 | BulletCatcher | https://github.com/BZFlag-Dev/bzflag-import-2/blob/master/svn_to_git/svn2git.sh shows how complicated it was just to get that far. |
| 03:16.55 | allejo | oh god |
| 03:17.54 | allejo | are the branches in bzflag-import-2 going to be used? |
| 03:21.33 | BulletCatcher | That's why they are there. |
| 03:27.21 | BulletCatcher | According to my view of the permissions at SourceForge, allejo shouldn't have been able to commit r22830. |
| 03:27.24 | BulletCatcher | Even the problem is that I am confused, that's a reason to move elsewhere. |
| 03:28.54 | allejo | oh sorry :x |
| 03:29.40 | JeffM | I had some perms screwed up at once and changed them |
| 03:30.07 | allejo | so future commits should stick to the bzflag-import-2 repo on github? |
| 03:30.31 | JeffM | that sounds exceptionaly lame |
| 03:30.34 | BulletCatcher | Yes, please. Until bzflag-import-3 appears. |
| 03:30.56 | JeffM | at some point you are going to put the candle back right? |
| 03:31.47 | BulletCatcher | Yup, but I need to spend some more time on getting all the old revisions into clean branches. |
| 03:32.54 | JeffM | is there any reason for the current regular named one then? |
| 03:33.42 | BulletCatcher | It does have all of the older commits, but they are in a messy tree and some of the tags are wrong. |
| 03:34.03 | JeffM | odds of anyone using them? |
| 03:34.37 | BulletCatcher | We don't need to toss it yet, but it might help if we renamed it to bzflag-import-1 or similar. |
| 03:35.03 | JeffM | it is a bit confusing |
| 03:35.12 | BulletCatcher | I understand. |
| 03:35.21 | BulletCatcher | ... that it is confusing. |
| 03:35.37 | JeffM | if anyone needs the old tags they can get them from svn |
| 03:35.46 | JeffM | so may as well make your -2 be the only one |
| 03:37.28 | BulletCatcher | The plain "bzflag" repo also has a pull request. |
| 03:37.29 | BulletCatcher | Not sure if khonkhortisan cares enough about it to keep it. |
| 03:37.53 | JeffM | what is it? |
| 03:37.57 | khonkhortisan | hmm? |
| 03:38.14 | BulletCatcher | https://github.com/BZFlag-Dev/bzflag/pull/1 |
| 03:38.21 | BulletCatcher | -noSelfKills |
| 03:38.23 | allejo | i think it'd the self kill |
| 03:38.25 | allejo | yea |
| 03:38.35 | JeffM | I closed that |
| 03:38.54 | BulletCatcher | And then you repoened it. :-) |
| 03:39.08 | JeffM | why would I do that? |
| 03:39.20 | BulletCatcher | I'm not a mind reader. |
| 03:39.44 | JeffM | yeah that should be a feature in 2.6 differently |
| 03:39.48 | JeffM | I'd not worry about it |
| 04:19.31 | *** join/#bzflag noyb (~noyb@172.250.108.23) |
| 04:30.14 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 05:17.14 | *** join/#bzflag swigg_ (~swigg@71-85-132-63.dhcp.spbg.sc.charter.com) |
| 05:50.01 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 06:02.19 | *** join/#bzflag a_meteor (~a_meteori@unaffiliated/ameteorite/x-000000001) |
| 09:06.40 | *** join/#bzflag catay (~smertens@valyria.catay.be) |
| 12:21.50 | blast007 | so, I guess here's a question... are we seeing any benefit to using Git instead of SVN? |
| 12:22.37 | blast007 | maybe we'd just be better off sticking with SVN for the core game code if it's gonna be so much of a hassle to migrate |
| 12:22.57 | blast007 | new projects could be put in git/mercurial |
| 12:23.54 | short_circuit | I would agree.. In my uneducated but otherwise considered opinion. |
| 12:49.00 | ruskie | there is a git-svn toolset for those that want to use git stuff |
| 13:20.45 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 13:25.04 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 15:47.50 | BulletCatcher | I think Git's branching model will be beneficial in the long run, and I am willing to make the effort to produce a faithful migration. |
| 16:19.46 | *** join/#bzflag TD-Linux (~TD-Linux@173.234.239.47) |
| 16:19.46 | *** join/#bzflag TD-Linux (~TD-Linux@about/essy/indecisive/TD-Linux) |
| 16:29.20 | *** join/#bzflag JeffM (~JeffM@107-209-61-105.lightspeed.irvnca.sbcglobal.net) |
| 16:29.20 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 16:29.20 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 18:04.08 | *** join/#bzflag TD-Linux (~TD-Linux@about/essy/indecisive/TD-Linux) |
| 18:59.58 | *** join/#bzflag swigg_ (~swigg@71-85-132-63.dhcp.spbg.sc.charter.com) |
| 21:00.22 | *** join/#bzflag ashvala_ (~ashvala@unaffiliated/ashvala) |
| 22:33.44 | *** join/#bzflag unclelightning (~chatzilla@pool-70-16-102-145.port.east.myfairpoint.net) |
| 22:54.57 | *** join/#bzflag Delusional (~delusiona@unaffiliated/delusional) |