| *** balleyne has joined #cc | 00:08 | |
| *** K`Tetch has quit IRC | 00:23 | |
| *** jgay has joined #cc | 01:03 | |
| *** pyrak_ has quit IRC | 01:21 | |
| *** pyrak_ has joined #cc | 01:28 | |
| *** zz_nb is now known as nb | 01:28 | |
| *** haoyu has quit IRC | 01:37 | |
| *** nb is now known as zz_nb | 02:10 | |
| *** zz_nb is now known as nb | 02:20 | |
| *** paroneayea has joined #cc | 02:26 | |
| *** balleyne has quit IRC | 02:28 | |
| *** balleyne has joined #cc | 02:29 | |
| *** haoyu has joined #cc | 02:32 | |
| *** balleyne has quit IRC | 02:32 | |
| *** jgay has quit IRC | 02:36 | |
| *** oshani has joined #cc | 02:46 | |
| *** haoyu has quit IRC | 03:43 | |
| *** JED3 has joined #cc | 03:55 | |
| *** haoyu has joined #cc | 04:25 | |
| *** sama has joined #cc | 04:53 | |
| *** Orango has quit IRC | 05:36 | |
| *** Orango has joined #cc | 05:38 | |
| *** JED3 has quit IRC | 05:55 | |
| *** JED3 has joined #cc | 05:56 | |
| *** haoyu has quit IRC | 05:57 | |
| *** JED3 has quit IRC | 06:07 | |
| *** oshani has quit IRC | 06:18 | |
| *** michi has joined #cc | 06:34 | |
| *** sama has quit IRC | 06:41 | |
| *** Danny_B has quit IRC | 07:09 | |
| *** Danny_B has joined #cc | 07:10 | |
| *** Danny_B has quit IRC | 07:15 | |
| *** Danny_B has joined #cc | 07:16 | |
| *** sama has joined #cc | 07:33 | |
| *** michi has quit IRC | 07:40 | |
| *** haoyu has joined #cc | 08:42 | |
| *** haoyu has quit IRC | 09:10 | |
| *** Orango has quit IRC | 09:39 | |
| *** Orango has joined #cc | 09:43 | |
| *** nb has quit IRC | 10:28 | |
| *** robmyers_ has quit IRC | 10:28 | |
| *** paulproteus has quit IRC | 10:28 | |
| *** nb has joined #cc | 10:29 | |
| *** robmyers_ has joined #cc | 10:29 | |
| *** paulproteus has joined #cc | 10:29 | |
| *** Orango has quit IRC | 10:45 | |
| *** robmyers_ has quit IRC | 10:51 | |
| *** nb has quit IRC | 10:51 | |
| *** paulproteus has quit IRC | 10:51 | |
| *** nb has joined #cc | 10:52 | |
| *** robmyers_ has joined #cc | 10:52 | |
| *** paulproteus has joined #cc | 10:52 | |
| *** Sitethief has joined #cc | 10:56 | |
| Sitethief | So apparently people can change the license on a picture that had been licensed under CC before. Isn't that impossible? | 10:57 |
|---|---|---|
| Sitethief | I mean, If you licenses somethign as CC, it is realeased under that license, if you can revoke that license then what is the use of CC | 11:06 |
| *** oshani has joined #cc | 11:12 | |
| *** oshani has quit IRC | 11:15 | |
| *** oshani has joined #cc | 11:15 | |
| *** oshani has quit IRC | 11:41 | |
| *** paroneayea has quit IRC | 11:43 | |
| *** robmyers_ has quit IRC | 11:50 | |
| *** nb has quit IRC | 11:50 | |
| *** paulproteus has quit IRC | 11:50 | |
| *** nb has joined #cc | 11:52 | |
| *** robmyers_ has joined #cc | 11:52 | |
| *** paulproteus has joined #cc | 11:52 | |
| *** robmyers_ has quit IRC | 11:54 | |
| *** nb has quit IRC | 11:54 | |
| *** paulproteus has quit IRC | 11:54 | |
| *** nb has joined #cc | 11:56 | |
| *** robmyers_ has joined #cc | 11:56 | |
| *** paulproteus has joined #cc | 11:56 | |
| Sitethief | So apparently people can change the license on a picture that had been licensed under CC before. Isn't that impossible? | 12:08 |
| Sitethief | So apparently people can change the license on a picture that had been licensed under CC before. Isn't that impossible? | 12:08 |
| Sitethief | oops | 12:08 |
| *** shellac has joined #cc | 12:23 | |
| *** Sitethief has quit IRC | 12:27 | |
| *** tvol has joined #cc | 13:04 | |
| *** tvol has quit IRC | 13:06 | |
| *** tvol has joined #cc | 13:06 | |
| *** kreynen has joined #cc | 13:08 | |
| *** oshani has joined #cc | 13:27 | |
| *** robmyers_ has quit IRC | 13:36 | |
| *** nb has quit IRC | 13:36 | |
| *** paulproteus has quit IRC | 13:36 | |
| *** UncleCJ has quit IRC | 13:36 | |
| *** CIA-32 has quit IRC | 13:36 | |
| *** freer has quit IRC | 13:36 | |
| *** NotADJ has quit IRC | 13:36 | |
| *** oshani has quit IRC | 13:36 | |
| *** shellac has quit IRC | 13:36 | |
| *** Danny_B has quit IRC | 13:36 | |
| *** CharelB has quit IRC | 13:36 | |
| *** greg-g has quit IRC | 13:36 | |
| *** lotia has quit IRC | 13:36 | |
| *** isforinsects has quit IRC | 13:36 | |
| *** Meteorswarm has quit IRC | 13:36 | |
| *** sama has quit IRC | 13:36 | |
| *** tvol has quit IRC | 13:36 | |
| *** pyrak_ has quit IRC | 13:36 | |
| *** Odd_Bloke has quit IRC | 13:36 | |
| *** ianweller has quit IRC | 13:36 | |
| *** papyromancer has quit IRC | 13:36 | |
| *** jonsson has quit IRC | 13:36 | |
| *** kreynen has quit IRC | 13:36 | |
| *** [mharrison] has quit IRC | 13:36 | |
| *** haoyu has joined #cc | 13:45 | |
| *** oshani has joined #cc | 13:45 | |
| *** kreynen has joined #cc | 13:45 | |
| *** tvol has joined #cc | 13:45 | |
| *** shellac has joined #cc | 13:45 | |
| *** paulproteus has joined #cc | 13:45 | |
| *** robmyers_ has joined #cc | 13:45 | |
| *** nb has joined #cc | 13:45 | |
| *** sama has joined #cc | 13:45 | |
| *** Danny_B has joined #cc | 13:45 | |
| *** pyrak_ has joined #cc | 13:45 | |
| *** papyromancer has joined #cc | 13:45 | |
| *** UncleCJ has joined #cc | 13:45 | |
| *** [mharrison] has joined #cc | 13:45 | |
| *** greg-g has joined #cc | 13:45 | |
| *** CharelB has joined #cc | 13:45 | |
| *** isforinsects has joined #cc | 13:45 | |
| *** Meteorswarm has joined #cc | 13:45 | |
| *** CIA-32 has joined #cc | 13:45 | |
| *** freer has joined #cc | 13:45 | |
| *** NotADJ has joined #cc | 13:45 | |
| *** Odd_Bloke has joined #cc | 13:45 | |
| *** ianweller has joined #cc | 13:45 | |
| *** lotia has joined #cc | 13:45 | |
| *** jonsson has joined #cc | 13:45 | |
| *** robmyers_ has quit IRC | 13:52 | |
| *** nb has quit IRC | 13:52 | |
| *** paulproteus has quit IRC | 13:52 | |
| *** nb has joined #cc | 13:53 | |
| *** robmyers_ has joined #cc | 13:53 | |
| *** paulproteus has joined #cc | 13:53 | |
| *** kreynen has quit IRC | 14:12 | |
| *** robmyers_ has quit IRC | 14:13 | |
| *** nb has quit IRC | 14:13 | |
| *** paulproteus has quit IRC | 14:13 | |
| *** nb has joined #cc | 14:14 | |
| *** robmyers_ has joined #cc | 14:14 | |
| *** paulproteus has joined #cc | 14:14 | |
| *** kreynen has joined #cc | 14:27 | |
| *** paroneayea has joined #cc | 14:30 | |
| *** mecredis has joined #cc | 14:44 | |
| paroneayea | morning | 14:44 |
| mecredis | morning | 14:47 |
| mecredis | just back from the windy city | 14:47 |
| mecredis | saw the bean yesterday | 14:47 |
| tvol | mecredis--that sculpture has to be the most photographed object in the midwest - seems like good candidate for Photosynth test ;) | 14:50 |
| mecredis | until you try the inside | 14:50 |
| mecredis | and then the universe collapses | 14:50 |
| *** nb has quit IRC | 14:53 | |
| *** nb has joined #cc | 14:57 | |
| *** haoyu has quit IRC | 15:36 | |
| *** stevel has joined #cc | 15:40 | |
| *** stevel has joined #cc | 15:41 | |
| *** K`Tetch has joined #cc | 16:08 | |
| *** sama has quit IRC | 16:11 | |
| *** JED3 has joined #cc | 16:14 | |
| *** pyrak_ has quit IRC | 16:37 | |
| *** Bovinity has joined #cc | 16:41 | |
| *** shellac has quit IRC | 16:45 | |
| *** pyrak_ has joined #cc | 17:40 | |
| *** pyrak_ is now known as pyrak | 17:42 | |
| *** mecredis_ has joined #cc | 18:30 | |
| *** nkinkade has joined #cc | 18:38 | |
| *** Roderick__ has joined #CC | 19:29 | |
| *** Roderick_ has quit IRC | 19:47 | |
| *** JED3 has quit IRC | 19:50 | |
| *** JED3 has joined #cc | 20:03 | |
| *** tvol has quit IRC | 20:16 | |
| *** Grath has joined #cc | 20:18 | |
| *** Grath has left #cc | 20:21 | |
| *** Grath has joined #cc | 20:21 | |
| *** michi_ has joined #cc | 20:22 | |
| *** K`Tetch has quit IRC | 20:44 | |
| pyrak | is there a better way to find/replace in all files in a dir other than looping with sed? | 20:54 |
| pyrak | also, nkinkade i need your help merging a development branch into the trunk for ccsearch, when you have a minute | 20:54 |
| nkinkade | pyrak: re: find/replace, I find perl to be nice for that. | 20:55 |
| nkinkade | But it's about the same as sed, really. | 20:55 |
| nkinkade | pyrak: What's the issue with merging? | 20:55 |
| pyrak | nkinkade, i'm too stupid to get svnmerge.py to do my bidding | 20:55 |
| nkinkade | Is this git? | 20:55 |
| pyrak | naw, svn | 20:55 |
| nkinkade | Oh, subversion. :-( | 20:55 |
| pyrak | :P | 20:55 |
| nkinkade | Did svnmerge give you some error? | 20:56 |
| pyrak | i was able to get it to work once before, with nyergler's help | 20:56 |
| *** michi_ has quit IRC | 20:56 | |
| pyrak | no, it seems to run fine and also seems to do nothing | 20:56 |
| pyrak | interestingly, i'm unable to uninit the branch that i've inited | 20:56 |
| JED3 | pyrak: grep for the pattern then pipe the files to sed | 20:57 |
| nkinkade | pyrak: So after you svnmerge merge -r <some revs>, svn status gives you nothing? | 20:57 |
| nkinkade | I personally like something like: | 20:57 |
| nkinkade | $ perl -pn -i.orig $(find <some files) | 20:58 |
| pyrak | nkinkade, hm, i've only been going svmerge.py merge -S branch-name | 20:58 |
| nkinkade | But sed can do the same basic thing. | 20:58 |
| nkinkade | pyrak: Ah, I wasn't even aware that svnmerge could merge a whole other branch. | 20:58 |
| nkinkade | pyrak: Are you doing this work on your local machine? | 20:59 |
| pyrak | nkinkade, yes | 20:59 |
| pyrak | well, i've been doing some devel on zearch also | 20:59 |
| pyrak | i mean, i can work on either | 21:00 |
| pyrak | atm, they're both at the most recent revision, which is commited and ready for merging | 21:00 |
| pyrak | the branch i | 21:00 |
| pyrak | 'm hoping to merge into the trunk is iframe-pretty | 21:00 |
| JED3 | pyrak: try specifying the revisions to merge into the trunk | 21:01 |
| pyrak | JED3, mgay | 21:01 |
| JED3 | pyrak: i think you want to merge r13084-13148 | 21:03 |
| nkinkade | pyrak: I'm only familiar with merging certain versions, if it's not to hard to do it that way. | 21:03 |
| pyrak | nkinkade, http://code.creativecommons.org/viewsvn/ | 21:05 |
| pyrak | :/ | 21:05 |
| nkinkade | Sorry about that. | 21:05 |
| nkinkade | a7 went down numerous times this weekend, and last night at about 1AM I temporarily disabled /viewgit and /viewsvn. | 21:06 |
| nkinkade | I'm pretty sure one of those two, if not both were the culprits. | 21:06 |
| nkinkade | Let me look into that now. | 21:06 |
| nkinkade | pyrak: ^ | 21:06 |
| pyrak | nkinkade, ok. for my purposes ATM, i'll just use svn log, so no hurry here | 21:07 |
| pyrak | JED3, i think you're right re: revision numbers | 21:07 |
| JED3 | yeah i'm pretty sure thats it | 21:08 |
| JED3 | i actually thought about that on my drive home, I get so burnt by Friday afternoon | 21:08 |
| pyrak | JED3, heh! best ideas happen in transit | 21:09 |
| pyrak | some time before getting on the bus this morning i realized why i was having mysql issues with another project last night | 21:10 |
| JED3 | haha yeah, you shouldn't think too hard while on a motorcycle though :) | 21:10 |
| nkinkade | JED3: How's that ferry ride working for you? Pleasant? | 21:10 |
| paroneayea | speaking of transportation, gotta pick up my car from the shop. Be back in a while | 21:11 |
| JED3 | nkinkade: I don't ride it much at all anymore, I ride my motorcycle into the city now since there is a free toll on the golden gate during commute hours | 21:12 |
| nkinkade | No toll on the GGB during commute hours! | 21:12 |
| JED3 | nkinkade: but that ferry ride is ridiculously too lavish for someone to get to experience every morning and afternoon | 21:13 |
| nkinkade | Wow. Did the ferry just get old, or take too long, too expensive, etc? | 21:13 |
| JED3 | too expensive | 21:13 |
| nkinkade | How long does the bike ride in take? | 21:13 |
| JED3 | they are having troubles with the ferry system too, it was becoming a bit annoying | 21:13 |
| JED3 | the ride in can take anywhere from 20 to 45 | 21:14 |
| JED3 | on motorbike | 21:14 |
| JED3 | ferry is a consistent 30 minutes | 21:14 |
| JED3 | nkinkade: if you ever did consider moving here you should look into the retired army barracks in the Marin Headlands | 21:16 |
| Bovinity | the marin headlands are so awesome | 21:17 |
| *** lep-delete has joined #cc | 21:17 | |
| Bovinity | fun riding too | 21:17 |
| nkinkade | Interesting. I like the small feel and slower pace up there in near Sausalito. | 21:17 |
| JED3 | yeah the headlands are amazing for sure | 21:18 |
| pyrak | nkinkade, JED3 so how should i init? | 21:18 |
| JED3 | I love how the deer and coyotes walk around freely without any fear of the people around | 21:19 |
| pyrak | from trunk, or from branch? and including BRANCH_URL? | 21:19 |
| pyrak | fwiw, nkinkade, me and JED3 were using this tutorial: | 21:19 |
| JED3 | pyrak: I think you already have init'd havent you? | 21:19 |
| pyrak | http://www.orcaware.com/svn/wiki/Svnmerge.py#Merging_development_branches_back_to_trunk | 21:19 |
| JED3 | because the pretty-iframe is listed in the avail group right? | 21:19 |
| nkinkade | Marin in general is a beautiful places ... great hiking. | 21:19 |
| nkinkade | I haven't seen that tutorial yet. Let me take a look. | 21:20 |
| pyrak | JED3, well, interestingly, in an earlier checkout (which has been up-ed to the most recent version), nothing is inited | 21:20 |
| * pyrak 's head explodes | 21:20 | |
| nkinkade | I'm updating my checkout of ccsearch so I can see what happens on my side. | 21:21 |
| pyrak | just tried: svnmerge.py merge -r 13084-13148 -S iframe-pretty | 21:24 |
| pyrak | same as before: reports nothing back, doesn't seem to have made any local changes | 21:25 |
| nkinkade | If you use -r can you still use -S, pyrak? | 21:28 |
| pyrak | nkinkade, not sure. i tried without -S, and it told me to use it | 21:28 |
| nkinkade | ? | 21:29 |
| pyrak | 1 sec | 21:29 |
| pyrak | nkinkade, pm | 21:30 |
| nkinkade | svnmerge: multiple sources found. Explicit source argument (-S/--source) required. | 21:30 |
| nkinkade | pyrak: But when I do and "svnmerge avail" I get nothing. | 21:30 |
| nkinkade | I'm not used to doing it this way. | 21:30 |
| nkinkade | It seems to me that /trunk should be development and that branches are what we publish. | 21:31 |
| pyrak | i'm extremely open to not doing it "this way" | 21:31 |
| pyrak | oh | 21:31 |
| nkinkade | As far as I know, svnmerge works like this: you svn cp /trunk to /branches/mybranch, for example. | 21:31 |
| pyrak | nkinkade, well, we could also replace search.cc.o with a checkout of iframe-pretty and call it a day | 21:31 |
| nkinkade | Then you svnmerge init /branches/mybranch, and it knows to look for possible commits from the source for merging. | 21:32 |
| nkinkade | Our usual setup is to svn cp /trunk /branches/production, then make our testing changes in /trunk, then later merge those commits into the /branches/production. | 21:33 |
| nkinkade | If we're not doing it that way right now, then we should probably consider doing it that way, or with something similar. | 21:33 |
| nkinkade | pyrak: ^^ | 21:33 |
| pyrak | nkinkade, that's perfectly reasonable | 21:33 |
| nkinkade | I guess the reason svnmerge want's -S is because there are various branches that were copies of /trunk | 21:34 |
| pyrak | i'm not at all wedded to this branch structure | 21:34 |
| nkinkade | svnmerge avail should return commits available for merging. | 21:34 |
| pyrak | into "." ? | 21:34 |
| nkinkade | Yeah. | 21:35 |
| pyrak | so shall we rename iframe-pretty to release, or something? | 21:35 |
| pyrak | also, just for my own sanity, am i correct in thinking that we had been releasing ccsearch from trunk before i started working on it? | 21:36 |
| nkinkade | pyrak: How about /branches/production? | 21:36 |
| pyrak | nkinkade, sure | 21:36 |
| nkinkade | pyrak: It wouldn't surprise me if that's how things were being done. | 21:36 |
| nkinkade | I don't think anyone had really touched ccsearch in a while. | 21:37 |
| nkinkade | About the time I came on board (2+ years ago), we were just then starting to move things to the /trunk, /branches/productions model. | 21:37 |
| paulproteus | Whoa, that was 2+ years ago. | 21:37 |
| paulproteus | I think I was doing releases off trunk of ccsearch, yeah. | 21:38 |
| nkinkade | paulproteus: Yeah, 2+ years now! June 4, 2007. Wow. | 21:38 |
| nkinkade | paulproteus: What's you're locale nowadays? | 21:38 |
| paulproteus | Atlanta, GA, still. But moving to Philadelphia (until the end of the year, at least) Aug. 25. | 21:38 |
| paulproteus | SF Aug 15-25! | 21:39 |
| nkinkade | Back to the North East. | 21:39 |
| paulproteus | I should, like, tell people about that. | 21:39 |
| * paulproteus nods | 21:39 | |
| pyrak | paulproteus, that is literally the day i leave | 21:39 |
| * paulproteus blinks | 21:39 | |
| paulproteus | What time? | 21:39 |
| nkinkade | How has Atlanta treated you. | 21:39 |
| nkinkade | ? | 21:39 |
| paulproteus | Maybe we can hang out in SFO. I arrive ca.2:15 PM. | 21:39 |
| pyrak | paulproteus, unless i convince my landpersons to let me crash another night or two so i can clean/party | 21:39 |
| paulproteus | pyrak, ...and what happens to your summer lease on Aug 15? | 21:39 |
| paulproteus | Oh, okay. | 21:39 |
| pyrak | but ATM, the agreement was "until" aug 15th | 21:40 |
| pyrak | 21:40 | |
| paulproteus | Shucks, I was hoping to crash there. (-; | 21:40 |
| pyrak | oh, re: SFO, i'm driving home | 21:40 |
| paulproteus | Oh, right! | 21:40 |
| paulproteus | Surely one of the other interns can let you crash at his/her place! | 21:40 |
| pyrak | paulproteus, very likely. my sister will also need a place. anyway, i'm sure i can work _something_ out | 21:41 |
| paulproteus | Right, natch. | 21:41 |
| paulproteus | nkinkade, Atlanta, well, I hardly know it. | 21:41 |
| paulproteus | We hardly leave home, we're too busy working and being poor! | 21:41 |
| nkinkade | And you're not really seeing the fun parts of Atlanta. | 21:42 |
| nkinkade | ... which are closer up towards downtown: Virginia Highlands, Little Five Points, East Atlanta, Midtown, etc. | 21:42 |
| paulproteus | I know! | 21:42 |
| paulproteus | I've seen a little of Little Five Points and of Midtown. | 21:42 |
| paulproteus | No East Atlanta (!) or Cabbagetown or Virginia Highlands. | 21:42 |
| nkinkade | I didn't know much about East Atlanta until a good childhood friend bought a house over there. I was just there a few weeks ago ... lots of fun restaurants, cafes, bars, and at the time there was even a music festival. | 21:43 |
| paulproteus | Yeah, I'm pretty excited about East Atlanta. | 21:44 |
| paulproteus | But the clock is ticking, and I see no time to hang out there. | 21:44 |
| paulproteus | Speaking of which I should deploy some bugfixes! | 21:44 |
| *** kreynen has quit IRC | 21:47 | |
| *** kreynen has joined #cc | 21:47 | |
| pyrak | nkinkade, shall i hold my breath and attempt to deploy at search.cc.o? | 21:49 |
| pyrak | i have a checkout of branches/production on zearch | 21:50 |
| nkinkade | pyrak: How did you arrive there? | 21:50 |
| pyrak | i svn mv-ed iframe-pretty | 21:50 |
| nkinkade | And iframe-pretty is a copy of /trunk? | 21:51 |
| pyrak | nkinkade, hmm, not sure | 21:51 |
| nkinkade | pyrak: ^^ | 21:51 |
| nkinkade | I'm not sure svnmerge will work right if it's not. | 21:51 |
| pyrak | nkinkade, it might have come froma nother branch | 21:51 |
| nkinkade | There may be some way to manipulate that after that fact. | 21:51 |
| nkinkade | There probably is a way to alter that later. | 21:52 |
| pyrak | well, if the next action task is to merge this branch into the trunk (so that we can branch off of it again), then we're back where we started, eh? | 21:52 |
| pyrak | nkinkade, also, fwiw, perhaps that's why we were having those troubles in the first place? | 21:53 |
| pyrak | as i think about it, i'm increasingly sure that i branched iframe-pretty off of local-providers | 21:54 |
| pyrak | (which can now be closed, i think) | 21:54 |
| nkinkade | pyrak: Let me check somethign quickly regarding svnmerge. | 21:54 |
| pyrak | sure. sorry this is being such a headache :/ | 21:55 |
| *** paroneayea has quit IRC | 21:57 | |
| *** paroneayea has joined #cc | 22:00 | |
| nkinkade | pyrak: I wonder if svnmerge is not showing available commits for -S branches/iframe-pretty because iframe-pretty is a copy of another branch? | 22:03 |
| nkinkade | I'm not sure if svnmerge can track changes across multiple copies??? | 22:03 |
| pyrak | nkinkade, could be. | 22:04 |
| nkinkade | pyrak: I suppose you don't have to use svnmerge to get your stuff back in /trunk. | 22:04 |
| pyrak | so then branching off of other branches is always a poor choice when you're working with svnmerge? | 22:04 |
| nkinkade | What we want to do is to get /trunk up to date (i.e. == to iframe-pretty) adn then copy /trunk to /branches/production. | 22:05 |
| pyrak | nkinkade, okay. so shall i try to do a normal svn merge from iframe-pretty to trunk, or shall i copy/paste files or something? | 22:06 |
| nkinkade | pyrak: I'm not a version control expert. Times like these are where I usually defer to Nathan, and in the past I would have deferred to Asheesh. However, that is what I would try to do. | 22:07 |
| nkinkade | It would be nice to have /trunk run zearch, and /branches/production running the live site. | 22:08 |
| nkinkade | ... since it's the model we are using elsewhere, and it works nicely. | 22:08 |
| pyrak | nkinkade, sure. i mean, right now, zearch/trunk runs trunk | 22:08 |
| pyrak | and zearch/otherthing runs otherthing | 22:08 |
| nkinkade | pyrak: zearch/trunk? | 22:09 |
| nkinkade | Is zearch it's own repository? | 22:09 |
| pyrak | nkinkade, no, i just have checkouts of various branches, as well as the trunk | 22:09 |
| nkinkade | Okay, I'm referring to only ccsearch/trunk, etc. | 22:10 |
| nkinkade | zearch is just a domain name, the way I think about it. | 22:10 |
| *** UncleCJ_ has joined #cc | 22:10 | |
| *** Grath has left #cc | 22:11 | |
| pyrak | okay. so for my next trick: i'll attempt to merge iframe-pretty into the trunk | 22:11 |
| pyrak | trying first with svn merge, then if i fail, copying files over | 22:11 |
| *** UncleCJ has quit IRC | 22:16 | |
| pyrak | nkinkade, okay, so production has been merged into trunk. next trick: delete production and cp trunk to branches/production? | 22:52 |
| nkinkade | pyrak: Cool. Thanks! So trunk is essentially what iframe-pretty was, and /branches/production is simply a copy of /trunk at the moment? | 22:54 |
| nkinkade | I guess now you should svnmerge init branches/production. | 22:55 |
| pyrak | nkinkade, the former is true, the latter is only going to be true after i make it so | 22:55 |
| nkinkade | Although, perhaps we can just use the svn for that now. I think our version of svn does everything svnmerge used to do. | 22:55 |
| pyrak | is there a better way to do that than to svn rm /branches/production and then svn mv trunk branches/production ? | 22:55 |
| nkinkade | You mean svn cp? | 22:56 |
| pyrak | nkinkade, oh dear. yes. | 22:56 |
| nkinkade | I don't know of a better way to do that. | 22:56 |
| pyrak | then i'll do it now | 22:56 |
| nkinkade | If this were git it would be so much easier. | 22:56 |
| nkinkade | Then again, if my aunt had balls, she'd be my uncle. | 22:56 |
| * pyrak could write an essay on that statement | 22:57 | |
| pyrak | okay, done | 23:02 |
| pyrak | now shall i attempt to deploy at search.cc.o? | 23:02 |
| pyrak | or hand it off to you? | 23:02 |
| pyrak | (you can double-check my work on zearch) | 23:03 |
| pyrak | nkinkade, ^^ | 23:04 |
| nkinkade | pyrak: Feel free to go ahead and deploy. Just do a cp -a on the www dir so that things don't work getting back is as simple as mv. | 23:05 |
| *** kreynen has quit IRC | 23:06 | |
| pyrak | nkinkade, here goes nothin'... | 23:07 |
| nkinkade | By the way /viewgit and /viewsvn are back. I didn't change anything. I had figured that paulproteus' work had somehow got undone, but it hadn't: http://labs.creativecommons.org/2008/12/02/ionicer-extra-friendly/ | 23:07 |
| pyrak | nkinkade, better to do a read-only checkout at search.cc.o? or does it matter? | 23:14 |
| nkinkade | pyrak: I think a read-only checkout is good for a production site. | 23:14 |
| nkinkade | It can be a pain in the ass, but it forces what is probably a good work-flow: change to trunk -> pull to staging for testing -> merge change to production -> pull to production. | 23:15 |
| pyrak | nkinkade, agreed. | 23:17 |
| nkinkade | pyrak: Have you deployed? | 23:17 |
| nkinkade | Looks like the old site still. | 23:17 |
| pyrak | nkinkade, one more question: | 23:18 |
| pyrak | since the previous version of search.cc.o/www is a checkout of trunk, do i need to do a checkout of branches/production, then rm -fr www and mv -r production/ www/ ? | 23:19 |
| pyrak | (if that makes sense) | 23:19 |
| pyrak | perhaps i'm being overly cautious | 23:20 |
| nkinkade | pyrak: Here's what I'd do: 1) move down one dir from www and then cp -a www www.2009-08-03 2) svn co branches/production www.new 3) mv www www.bak && mv www.new www 4) Make sure it works 5) rf -rf www.bak | 23:24 |
| nkinkade | That way www is a checkout of branches/production, yet www.2009-08-03 is a snapshot of what used to be there, just in case. | 23:25 |
| nkinkade | We have backups for that, but I like to keep a copy of the old one there for a while. | 23:25 |
| pyrak | nkinkade, okay, good. that's exactly what i was uneloquently trying to propose | 23:25 |
| pyrak | without the "&&", is that actual bash syntax? | 23:26 |
| nkinkade | && works in bash, probably sh too. | 23:26 |
| nkinkade | Only execute what is after && if the previous statements exited with no errors. | 23:27 |
| pyrak | gotcha | 23:27 |
| nkinkade | Yeah, it works in sh too. I just checked. | 23:28 |
| pyrak | nkinkade, okay, up and running! | 23:29 |
| nkinkade | pyrak: That's looking good. | 23:29 |
| nkinkade | I hope one day we'll be able t get rid of the frame. I like the more vibrant color of green in the header now. | 23:30 |
| pyrak | nkinkade, turns out i can't rm -rf www.back because i don't have sudo | 23:30 |
| nkinkade | And the new checkboxes looks MUCH better. | 23:30 |
| nkinkade | pyrak: I'll remove that directory. | 23:30 |
| pyrak | nkinkade, yeah. re: iframe. i suppose the next best thing is some api hacking | 23:31 |
| nkinkade | Gone. | 23:31 |
| pyrak | also, my no-iframe version is fully functional, but it's probably less useful because it requires an extra clickthrough to see results | 23:31 |
| nkinkade | I'd still like to see a bit more about what to expect from the result somewhere on the visible interface, but oh well. | 23:32 |
| nkinkade | We've got on without it for this long, so a bit longer isn't going to hurt anything. | 23:33 |
| pyrak | can someone confirm that disabling javascript with the web-developer toolbar doesn't cause firefox to render stuff between noscript tags? | 23:35 |
| pyrak | can someone also confirm that this sucks? | 23:35 |
| nkinkade | pyrak: With JS disabled nothing shows up in the main window. | 23:37 |
| pyrak | nkinkade, right. but how are you disabling js? | 23:38 |
| nkinkade | With Webdeveloper. :-) | 23:38 |
| pyrak | thus my question | 23:38 |
| nkinkade | I guess I'm confused about what your question was. | 23:39 |
| pyrak | do you know how noscript tags work? | 23:39 |
| pyrak | they work as you'd expect they would | 23:39 |
| pyrak | well, they ought to | 23:39 |
| pyrak | <noscript>this message is only visible if you don't have javascript</noscript> | 23:40 |
| pyrak | but apparently, when you disable javascript via web developer toolbar, that message doesn't show up | 23:40 |
| nkinkade | That somewhat sounds like a bug. | 23:40 |
| pyrak | That extremely sounds like a bug. | 23:40 |
| nkinkade | But a Firefox bug. | 23:41 |
| nkinkade | Because disabling JS through the Firefox preferences returns that same result. | 23:41 |
| pyrak | nkinkade, ah, then you are right. which version of ffx are you running? | 23:42 |
| Bovinity | i get noscript tags working when i disable JS in web dev | 23:42 |
| Bovinity | http://www.w3schools.com/TAGS/tryit.asp?filename=tryhtml_noscript is my test | 23:42 |
| nkinkade | 3.0.12 | 23:42 |
| pyrak | (ps: disabling javascript on opera does what you'd hope it would) | 23:42 |
| pyrak | Bovinity, search.cc.o should be your test! | 23:43 |
| Bovinity | there are no noscript tags on search.cc.org | 23:43 |
| pyrak | oh yes there are! | 23:43 |
| pyrak | sorta | 23:43 |
| Bovinity | hm, in the iframe, i see | 23:43 |
| Bovinity | remove the p tags | 23:43 |
| pyrak | Bovinity, why? | 23:44 |
| Bovinity | try it | 23:44 |
| pyrak | Bovinity, you think this will fix the ffx issue? | 23:44 |
| Bovinity | yes | 23:44 |
| pyrak | k. trying. | 23:45 |
| pyrak | ps: a8 is being SUPER slow right now | 23:46 |
| pyrak | Bovinity, narp, no change. | 23:47 |
| pyrak | http://zearch.creativecommons.org/trunk/no-script.php | 23:47 |
| pyrak | perhaps it's something that has since been fixed in 3.5 ? | 23:47 |
| Bovinity | i'm on 3.5.2 | 23:48 |
| pyrak | Bovinity, and no-script.php shows you text? | 23:48 |
| Bovinity | no, i see nothing | 23:48 |
| Bovinity | what if you put it within a normal html page structure.... <html><body>... | 23:48 |
| pyrak | Bovinity, sure. 1 sec | 23:49 |
| *** stevel has quit IRC | 23:50 | |
| *** balleyne has joined #cc | 23:59 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!