| 00:02.24 | *** join/#bzflag blast (~blast@bzflag/developer/Blast) |
| 00:02.24 | *** mode/#bzflag [+v blast] by ChanServ |
| 00:46.14 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 00:46.14 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 00:48.56 | JeffM | no word back from the owner of the Github org:( |
| 00:50.57 | blast007 | maybe they left you a private message in their private repo |
| 00:54.09 | *** join/#bzflag [dmp] (~dennis@users.d75.net) |
| 00:54.09 | *** join/#bzflag [dmp] (~dennis@unaffiliated/dmp/x-546784) |
| 00:58.26 | JeffM | heh |
| 00:58.32 | blast007 | JeffM: you know, before using Git, I thought I disliked it. |
| 00:58.40 | blast007 | Turns out I actually hate it. |
| 00:58.42 | blast007 | ;) |
| 00:58.43 | JeffM | heh |
| 00:59.23 | blast007 | modify a file? well, you have to 'git add' the file before you can commit the change...... |
| 00:59.51 | JeffM | I've never had to do that |
| 00:59.55 | JeffM | edit, commit |
| 00:59.56 | blast007 | cuz 'git add' not only adds new files, but it also stages changes to files that are already tracked |
| 01:00.13 | blast007 | I did a commit, but the file I modified wasn't "staged" so it didn't include my change |
| 01:00.24 | JeffM | hmm, I've never seen that happen |
| 01:00.29 | blast007 | did you only use GUI tools? |
| 01:00.30 | JeffM | how did you edit the file? |
| 01:00.37 | blast007 | with vim |
| 01:00.49 | JeffM | I've used command line, tort, and the github tool |
| 01:00.59 | blast007 | I cloned a repo, added a file, then edited an existing file, ran a commit, and it included the new file, but not my change |
| 01:01.10 | JeffM | hmm |
| 01:01.24 | JeffM | I do that all the time on my spaceship project with no problem |
| 01:01.34 | blast007 | http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository |
| 01:01.37 | JeffM | I've had problems merging upstream commits, but never simple stuff like that |
| 01:01.44 | blast007 | "Staging Modified Files" |
| 01:02.22 | blast007 | ah, you can do git commit -a to skip the staging area |
| 01:02.28 | blast007 | sigh... |
| 01:03.39 | blast007 | think I'll keep the web stuff in mercurial on bitbucket ;) |
| 01:03.46 | JeffM | k |
| 01:04.19 | JeffM | may be good to compare the systems with active projects |
| 01:04.40 | blast007 | I even have the 'bzflag' team name there |
| 01:04.59 | JeffM | heh |
| 01:12.51 | TimRiker | BulletCatcher, just added my server on it's new IP. more secondary servers are always welcome. Looks like I'll be removing mecworks at least till the owner gets around to fixing it. |
| 01:22.48 | *** join/#bzflag apeman_ (~apeman@202.36.179.100) |
| 01:25.06 | *** join/#bzflag rathis (~rathis@2.217.223.42) |
| 01:34.23 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 02:08.23 | *** join/#bzflag alpha1-2 (~nb_j@host5.190-230-18.telecom.net.ar) |
| 02:12.15 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 02:12.15 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 02:14.15 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 02:23.13 | *** join/#bzflag JeffM__ (~JeffM@cl214184.wl.callutheran.edu) |
| 02:23.22 | Constitution | blast007: how else do you want it to distinguish between files you are ready to commit and files you are not? |
| 02:23.53 | Constitution | and besides, there's a command argument to commit all modified files already existing in source control |
| 02:24.48 | Constitution | oh nvm, you already saw that |
| 02:30.24 | blast | Constitution: by specifying the ones I want to commit (or assuming I want to commit all of them) like I do with svn and mercurial ;) |
| 02:31.29 | blast | svn and mercurial assume you want to commit all changes unless you tell it otherwise, where git is almost the opposite |
| 02:31.47 | blast | so a 'diff' in svn and mercurial match what would happen if you just give a raw commit |
| 02:32.14 | blast | in git it only matches if you do a 'git commit -a' |
| 02:32.24 | blast | (or manually 'git add' all the modified files) |
| 02:33.45 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 02:33.45 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 02:34.01 | Constitution | right, so you can easily distinguish between them and see exactly what you are committing |
| 02:35.12 | blast | or you can see what you might think you are commiting if you were a subversion user, but actually won't be unless you pass an extra flag |
| 02:35.15 | blast | ;) |
| 02:36.26 | Constitution | so your complaint is that git is not subversion? ok |
| 02:36.47 | Constitution | I'm just saying, it's actually helpful in some cases |
| 02:36.48 | blast | more that it differs from the two other systems I've used |
| 02:37.01 | blast | one of which is also a DVCS |
| 02:37.21 | mebigfatguy | i didn't like the git index at first either, but now it's one of my favorite things |
| 02:37.45 | mebigfatguy | very often i have a bunch of files modified, some of which i want to commit, others not... makes it very easy |
| 02:37.49 | JeffM | you can use svn from github IIRC |
| 02:37.59 | blast | JeffM: yeah, I'll probably be using that |
| 02:38.02 | Constitution | I've found it very helpful if I'm working on multiple things and need to commit a quick change to something else |
| 02:41.53 | JeffM | it is a different way of looking at commits |
| 02:41.59 | JeffM | I have to change my expectations |
| 02:42.13 | JeffM | and some times it's hard to figure out the git way to do things I want to do |
| 02:50.59 | JeffM | Constitution, is that what a temp branch is for? |
| 02:52.39 | blast007 | JeffM: or 'git stash' http://git-scm.com/book/en/Git-Tools-Stashing |
| 03:04.53 | *** join/#bzflag JeffM__ (~JeffM@cl214184.wl.callutheran.edu) |
| 03:05.33 | *** join/#bzflag unclelightning (~chatzilla@pool-70-16-103-209.port.east.myfairpoint.net) |
| 03:53.01 | *** join/#bzflag JeffM (~JeffM@cl214184.wl.callutheran.edu) |
| 03:53.06 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 03:53.06 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 04:24.24 | khonkhortisan | If anyone is familiar with comet busters, please tell me how to lower the difficulty |
| 04:32.53 | *** join/#bzflag JeffM (~JeffM@cpe-76-167-236-199.socal.res.rr.com) |
| 04:32.54 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 04:32.54 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 05:07.44 | *** join/#bzflag Gnurdux (~gnurdux@c-67-186-57-145.hsd1.pa.comcast.net) |
| 05:55.34 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 06:11.06 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 06:27.04 | *** join/#bzflag apeman_ (~apeman@187.250.69.111.dynamic.snap.net.nz) |
| 07:23.40 | *** join/#bzflag PrezKennedy (~DarkCalf@173.231.40.99) |
| 10:33.39 | *** join/#bzflag blast (~blast@bzflag/developer/Blast) |
| 10:33.40 | *** mode/#bzflag [+v blast] by ChanServ |
| 11:38.19 | *** join/#bzflag Shuist (~Shuist@ppp203-122-213-220.static.internode.on.net) |
| 11:56.55 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 12:03.51 | *** join/#bzflag Rob5a (~Rob5a@cable-95-168-156-153.cust.telecolumbus.net) |
| 12:22.40 | joevano | looks like my git-svn it finally fixed and working... conversion nearing completion |
| 12:26.14 | *** join/#bzflag blast (~blast@bzflag/developer/Blast) |
| 12:26.14 | *** mode/#bzflag [+v blast] by ChanServ |
| 12:41.23 | *** join/#bzflag Pimpinella (~frank@gondolin.pimpi.org) |
| 13:53.47 | *** join/#bzflag tw1sted (~tw1sted@unaffiliated/tw1sted) |
| 14:27.04 | *** join/#bzflag ashvala (~ashvala@unaffiliated/ashvala) |
| 15:04.18 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 15:04.18 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 15:21.34 | alezakos | You can use svn on a github repo indeed, and you can browse branches,tags or even commit, wihtout any need to install the git client |
| 15:25.41 | *** join/#bzflag unclelightning (~chatzilla@pool-70-16-103-209.port.east.myfairpoint.net) |
| 15:32.36 | *** join/#bzflag Marzipan (~Marzipan@sign-4d094ed5.pool.mediaWays.net) |
| 15:59.01 | blast007 | khonkhortisan: geez, that's not even midly fun to be on, is it? |
| 16:03.27 | BulletCatcher | TimRiker: The addition of ns1.rikers.org as a nameserver seems to be working fine. |
| 16:03.29 | BulletCatcher | If you'll remove the ns.mecworks.com NS record from both the zone and the registry that should get us back to 100% service. |
| 16:34.05 | khonkhortisan | it is now that it discards the shots from the previous games |
| 16:46.42 | *** join/#bzflag JeffM (~JeffM@107-209-61-105.lightspeed.irvnca.sbcglobal.net) |
| 16:46.42 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 16:46.42 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 17:17.35 | joevano | svn -> git conversion 18+ hours and still going... |
| 17:17.41 | JeffM | wow |
| 17:18.21 | joevano | yeah... running on a brand new wachine with a local vsvn server version |
| 17:18.30 | joevano | machine* |
| 17:25.07 | JeffM | oh joevano can you test and see if you can create repositories for the BZFLag-dev org, I am not sure what "admin" perms mean in the team settings, if it's the ability to create repos or just mange existing ones |
| 17:34.23 | joevano | k.. will do... |
| 17:34.33 | JeffM | thanks |
| 17:35.00 | joevano | the conversion is no "Checking Out HEAD" so maybe it is finished :-) |
| 17:35.40 | joevano | then I need to do a little clean up and then split it up... don't think that will take nearly as long though |
| 17:35.55 | JeffM | how big was the respository with history? |
| 17:37.43 | joevano | and finished at about 18.5 hours |
| 17:38.58 | blast007 | JeffM: 493MB |
| 17:39.05 | JeffM | not too horrible |
| 17:39.46 | blast007 | and gzip'ed down to a nice 178MB ;) |
| 17:46.54 | joevano | full git repo with all history 298.MB on disk... full SVN checkout 4.49GB on disk |
| 17:47.29 | blast007 | not a fair comparison |
| 17:47.46 | joevano | why not |
| 17:48.23 | blast007 | it's 493MB versus 298MB |
| 17:48.38 | JeffM | since those are the sizes of the working respositories |
| 17:48.43 | JeffM | not expanded history |
| 17:49.30 | joevano | no... the GIT includes a full checkout of all files as well |
| 17:50.13 | blast007 | no, it doesn't. it contains a working directory with a single snapshot of trunk. |
| 17:50.53 | blast007 | so you're comparing an SVN checkout of / with an SVN checkout of /trunk/ |
| 17:50.58 | blast007 | of course / would be larger |
| 17:51.15 | joevano | ah.. right |
| 17:57.07 | blast007 | so actually a fair comparison would be a git clone versus an SVN repo sync + SVN trunk checkout |
| 18:22.42 | *** join/#bzflag Gnurdux (~gnurdux@CMU-869651.WV.CC.CMU.EDU) |
| 19:09.42 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 19:36.44 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 20:07.42 | *** join/#bzflag JeffM (~JeffM@107-209-61-105.lightspeed.irvnca.sbcglobal.net) |
| 20:07.43 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 20:07.43 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 20:12.23 | *** join/#bzflag randomparticle (~randompar@about/essy/snick/randomparticle) |
| 20:46.23 | joevano | blast007: I say it depends on perspective... from a developer perspective, I need the full SVN checkout to get everything I can do with the git repo |
| 20:46.46 | blast007 | no you don't |
| 20:55.35 | blast007 | for some operations with subversion, you don't even need to checkout code at all (svn move, svn copy, for instance) |
| 21:00.47 | JeffM | still on that? |
| 21:05.23 | joevano | I'm still trying to think it through... sometimes I'm a little slow |
| 21:06.29 | khonkhortisan | When I'm working locally, I prefer branches to patches |
| 21:11.55 | Constitution | can you really compare branches to patches? |
| 21:17.33 | Constitution | is today the day of quitting in leiu of answering questions? |
| 21:25.21 | *** join/#bzflag FastLizard4 (fastlizard@wikipedia/pdpc.active.FastLizard4) |
| 21:25.39 | *** join/#bzflag FastLizard4|away (fastlizard@wikipedia/pdpc.active.FastLizard4) |
| 21:29.37 | blast007 | Constitution: maybe |
| 21:30.07 | joevano | I thought it meant I won ;-) |
| 21:31.15 | blast007 | no, just meant I switched from my linksys router to a pfSense box as I prep to add an IPv6 tunnel ;) |
| 21:31.30 | joevano | oh, dissapointing |
| 21:32.45 | joevano | going to try pushing bzedit up to github as a test in about an hour when I get home, if it all looks good |
| 21:33.00 | blast007 | okay |
| 21:33.26 | blast007 | how did you handle stuff moving from trunk/db/ to trunk/web/bzfls/ ? |
| 21:34.43 | joevano | well... we will see once the rewrite is done |
| 21:34.57 | blast007 | :) |
| 21:35.08 | joevano | basically... I have to remove stuff that I don't want to stay |
| 21:35.36 | joevano | then rewrite the commits... so it should "move" just fine |
| 21:36.04 | *** join/#bzflag Delusional (~delusiona@unaffiliated/delusional) |
| 21:36.17 | *** join/#bzflag alpha1-2 (~nb_j@host5.190-230-18.telecom.net.ar) |
| 21:37.24 | joevano | takes a while to rewrite 19679 commits |
| 21:40.57 | blast007 | sounds like a blast ;) |
| 21:41.23 | *** join/#bzflag swigg (~swigg@bzflag/player/Swigg) |
| 21:43.17 | Constitution | will we have to do this all over again some point in the future? or is this _the_ big switch? |
| 21:48.02 | blast007 | this would be the big switch |
| 21:51.16 | *** join/#bzflag khonkhortisan_ (~kyle@c-76-121-156-73.hsd1.wa.comcast.net) |
| 22:33.39 | *** join/#bzflag tw1sted (~tw1sted@unaffiliated/tw1sted) |
| 22:49.30 | *** join/#bzflag ahs3- (~ahs3-@adsl-065-005-193-158.sip.rdu.bellsouth.net) |
| 22:56.37 | *** join/#bzflag Gnurdux (~gnurdux@CMU-869651.WV.CC.CMU.EDU) |
| 23:06.47 | *** join/#bzflag JeffM (~JeffM@107-209-61-105.lightspeed.irvnca.sbcglobal.net) |
| 23:06.48 | *** join/#bzflag JeffM (~JeffM@unaffiliated/jeffm2501) |
| 23:06.48 | *** mode/#bzflag [+v JeffM] by ChanServ |
| 23:11.40 | *** join/#bzflag ahs3- (~ahs3-@adsl-065-005-193-158.sip.rdu.bellsouth.net) |
| 23:19.56 | *** join/#bzflag randomparticle (~randompar@about/essy/snick/randomparticle) |
| 23:34.13 | *** join/#bzflag blast (~blast@bzflag/developer/Blast) |
| 23:34.13 | *** mode/#bzflag [+v blast] by ChanServ |