| nathany | nkinkade: Bovinity: is it possible we're not using svnmerge on ccwordpress? | 00:13 |
|---|---|---|
| nathany | i could've sworn we were | 00:13 |
| Bovinity | nathany: we are | 00:13 |
| nathany | the properties don't seem to be there | 00:13 |
| nkinkade | nathany: I second what Bovinity said. | 00:15 |
| nathany | ok, wait, maybe my local checkout if fucked | 00:15 |
| nkinkade | Let me double check mine, but I've used it just recently. | 00:15 |
| nathany | weird, i had the property deleted on my checkout | 00:16 |
| nathany | that's f'd | 00:16 |
| nkinkade | Did an svn up bring it back? | 00:17 |
| nathany | nkinkade: yeah, just did svn revert | 00:28 |
| nathany | it does looks like there are lots of revs marked as "unmerged" that surely have been | 00:29 |
| nathany | for example, hasn't ecuador launched long ago? | 00:29 |
| *** tanjir has joined #cc | 00:51 | |
| *** nathany has quit IRC | 01:17 | |
| *** Bovinity has quit IRC | 01:40 | |
| *** skyfaller has joined #cc | 01:55 | |
| skyfaller | what ever happened to the wplicense plugin for Wordpress? http://wiki.creativecommons.org/WpLicense ... is there a reason why nobody has updated it in over a year? | 01:55 |
| skyfaller | also the subversion repository seems to have gone missing | 01:56 |
| paulproteus | skyfaller, Eep! | 02:05 |
| paulproteus | The documentation must be out of date. | 02:05 |
| paulproteus | 'Cause we have been putting in maintenance. | 02:05 |
| paulproteus | And we even use it! | 02:05 |
| skyfaller | lol | 02:06 |
| skyfaller | you should put the canonical version in the Wordpress plugins directory | 02:06 |
| paulproteus | Of course we should. | 02:13 |
| * paulproteus files two issues | 02:14 | |
| paulproteus | There are two bugs. I will handle them soon! | 02:18 |
| paulproteus | (c.f. code.creativecommons.org/issues ) | 02:18 |
| *** skyfaller has quit IRC | 02:19 | |
| *** skyfaller has joined #cc | 02:28 | |
| *** skyfaller has joined #cc | 02:29 | |
| *** mlinksva has quit IRC | 03:12 | |
| *** nkinkade has left #cc | 03:22 | |
| *** K`Tetch has joined #cc | 03:48 | |
| *** tanjir_ has joined #cc | 04:11 | |
| *** tanjir has quit IRC | 04:23 | |
| *** tanjir_ has quit IRC | 04:30 | |
| *** CIA-35 has quit IRC | 05:58 | |
| *** CIA-66 has joined #cc | 06:00 | |
| *** odili40000 has joined #cc | 06:48 | |
| *** odili40000 has quit IRC | 07:21 | |
| *** sama has joined #cc | 08:53 | |
| *** NotADJ has quit IRC | 08:57 | |
| *** UncleCJ has quit IRC | 08:57 | |
| *** _stink_ has quit IRC | 08:57 | |
| *** CIA-66 has quit IRC | 08:57 | |
| *** K`Tetch has quit IRC | 08:57 | |
| *** m3cr3d1s has quit IRC | 08:57 | |
| *** paulproteus has quit IRC | 08:57 | |
| *** sama has quit IRC | 08:57 | |
| *** isforinsects has quit IRC | 08:57 | |
| *** skyfaller has quit IRC | 08:57 | |
| *** [mharrison] has quit IRC | 08:57 | |
| *** ianweller has quit IRC | 08:57 | |
| *** sama has joined #cc | 08:58 | |
| *** CIA-66 has joined #cc | 08:58 | |
| *** K`Tetch has joined #cc | 08:58 | |
| *** skyfaller has joined #cc | 08:58 | |
| *** [mharrison] has joined #cc | 08:58 | |
| *** NotADJ has joined #cc | 08:58 | |
| *** paulproteus has joined #cc | 08:58 | |
| *** isforinsects has joined #cc | 08:58 | |
| *** UncleCJ has joined #cc | 08:58 | |
| *** _stink_ has joined #cc | 08:58 | |
| *** ianweller has joined #cc | 08:58 | |
| *** m3cr3d1s has joined #cc | 08:58 | |
| *** [mharrison] has quit IRC | 10:38 | |
| *** [mharrison] has joined #cc | 10:45 | |
| *** UncleCJ2_ has quit IRC | 10:49 | |
| *** TRD has joined #cc | 11:54 | |
| *** TRD has quit IRC | 12:01 | |
| *** TRD has joined #cc | 12:04 | |
| *** UncleCJ2_ has joined #cc | 12:12 | |
| *** UncleCJ2_ has quit IRC | 13:47 | |
| *** nkinkade has joined #cc | 15:08 | |
| *** UncleCJ2_ has joined #cc | 15:15 | |
| *** m3cr3d1s has quit IRC | 15:15 | |
| *** UncleCJ2_ has quit IRC | 15:18 | |
| *** UncleCJ2_ has joined #cc | 15:34 | |
| *** nathany has joined #cc | 15:53 | |
| nkinkade | paulproteus: What did you make of your merge attempts with CiviCRM yesterday? | 16:13 |
| *** skyfaller has left #cc | 16:14 | |
| nkinkade | nathany: On the CCi database thing, I'm waiting to hear from you, and you're waiting to hear from Ethan. Is that right? | 16:14 |
| nathany | nkinkade: you're waiting to hear from me, I'm procrastinating on writing Ethan :) | 16:15 |
| nkinkade | :-) | 16:15 |
| nkinkade | Just wanted to make sure I wasn't blocking it. | 16:15 |
| nkinkade | I'll keep waiting. | 16:15 |
| nkinkade | paulproteus: By the way, I just had occasion to send someone a link to your Pootle screencasts. Thanks. | 16:16 |
| *** nkinkade has left #cc | 16:46 | |
| *** jgay has joined #cc | 16:47 | |
| *** nkinkade has joined #cc | 16:48 | |
| *** sama has quit IRC | 16:53 | |
| *** mlinksva has joined #cc | 16:54 | |
| nkinkade | paulproteus: ^^ re: civicrm git merge. | 16:57 |
| nkinkade | There are 363 conflicts in that merge, which is all out of proportion. | 17:00 |
| *** Clubbermga has joined #cc | 17:01 | |
| *** Clubbermga has left #cc | 17:01 | |
| *** UncleCJ2_ has quit IRC | 17:03 | |
| *** stevel has joined #cc | 17:04 | |
| *** Multiple-Paralax has joined #cc | 17:04 | |
| Multiple-Paralax | is there a place somewhere to post CC writing?..permanately | 17:04 |
| *** K`Tetch has quit IRC | 17:05 | |
| Multiple-Paralax | i wrote a small article for entertainment, but ive no where to host it heh | 17:05 |
| nkinkade | Multiple-Paralax: You could post in on archive.org | 17:06 |
| nkinkade | They host CC-licensed content for free. | 17:06 |
| Multiple-Paralax | oh | 17:06 |
| Multiple-Paralax | http://pastebin.com/m1d449fb6 <--thats it | 17:06 |
| *** K`Tetch has joined #cc | 17:06 | |
| Multiple-Paralax | incase you want to read..its kinda lol | 17:06 |
| nkinkade | Very. :-) | 17:07 |
| paulproteus | nkinkade, Wow! re: screencasts | 17:07 |
| paulproteus | nkinkade, I agree re: out of proportion. | 17:07 |
| nkinkade | I feel pretty dull-witted to have all this time thought it was a matter of turning the cap counterclockwise and then drinking. | 17:08 |
| nkinkade | :-) | 17:08 |
| nkinkade | paulproteus: I don't know what to do about it. | 17:08 |
| Multiple-Paralax | lol | 17:08 |
| Multiple-Paralax | i got bored, and wanted to describe something use insane techspeak | 17:08 |
| paulproteus | I bought some "Strawberry Moss" drink at a middle eastern place an hour ago. | 17:08 |
| Multiple-Paralax | and/or made up words | 17:08 |
| paulproteus | It's delicious. All I had to do is turn the cap counterclockwise and then drink. | 17:08 |
| nkinkade | It was barbarous act of reductionism on my part. | 17:08 |
| nkinkade | paulproteus: What do you suggest for the civicrm stuff? I looked last night at playing around with the git-mergetool, and I even briefly tried to make a shell script called mediff3, but it didn't work. | 17:09 |
| paulproteus | nkinkade, What I make of it is that we don't have a whole lot of changes. | 17:10 |
| paulproteus | I'll try to create said shell script now. | 17:10 |
| nkinkade | paulproteus: It's possible that we have none to the core files, or none that haven't already been added to the 2.1 sources by the devs. | 17:11 |
| paulproteus | I think that's likely. | 17:11 |
| paulproteus | You can check by doing git diff origin/REL_2_0_9..cc_staging (or similar) | 17:11 |
| nkinkade | Do you think it's because we are making such a huge leap in versions? I hope it isn't like this for future upgrades. | 17:11 |
| paulproteus | I imagine it has to do with the big leap, but we'll be making big leaps from time to time anyway. | 17:13 |
| paulproteus | Let me try some stuff; tty in 10m or so. | 17:13 |
| * paulproteus builds a modern kdiff3... | 17:22 | |
| paulproteus | I really look forward to Debian lenny releasing. | 17:22 |
| *** CIA-66 has quit IRC | 17:27 | |
| paulproteus | nkinkade, So there are two reasonable ways forward. | 17:32 |
| paulproteus | BTW, note that this is weirder than usual because civicrm is using svn histories, not git histories. | 17:32 |
| paulproteus | If they were actually using git, this would all be more natural. (In particular there would be fewer divergences in the history.) | 17:33 |
| nkinkade | paulproteus: So it begs the question as to whether we'd be better of having it in subversion repository. | 17:33 |
| nkinkade | Sounds like we're trying to hammer a square peg into a round hole. | 17:33 |
| paulproteus | Way 1: Create a new set of (production, staging) branches based on 2_1_x by just doing: | 17:33 |
| paulproteus | $ git checkout origin/tags/2_1_whatever | 17:33 |
| paulproteus | # open up gitk | 17:34 |
| paulproteus | Er, make a branch first. | 17:34 |
| paulproteus | Then, see if there's anything in the old CC branch you want, and if there is, right-click on it and cherry pick it in. | 17:34 |
| paulproteus | And test, and if you like it, call it production. | 17:34 |
| nkinkade | paulproteus: This is essentially what I suggested yesterday. | 17:34 |
| paulproteus | Note that gitk and cherry-pick are nicer in git than anything svn offers. | 17:34 |
| paulproteus | Yes. | 17:34 |
| paulproteus | Way 2: Write the "trivial" shell script that for no good reason I haven't written yet. | 17:35 |
| nkinkade | I think I like Way 1 better. | 17:35 |
| nkinkade | It seems more natural. | 17:35 |
| paulproteus | The downside of "Way 1" is that on the live sites, you can't use "merge" into the new thing; you'd have to "git checkout" into it. | 17:36 |
| nkinkade | Our changes amount to a theme, 2 or 3 custom templates, and that may be all. | 17:36 |
| paulproteus | Regardless, I'm going to take a moment to write the Way 2 script and see how it fares. | 17:36 |
| paulproteus | I'm sure I'll need it for something else later on anyway. | 17:36 |
| nkinkade | How much easier would this be if we were using subversion for this instead of git? | 17:37 |
| paulproteus | Dealing with upgrades *within* releases would be way harder, I feel. | 17:38 |
| *** UncleCJ2_ has joined #cc | 17:38 | |
| nkinkade | So what was causing all those merge conflicts? git-svn inadequacies? | 17:38 |
| paulproteus | ...hey, wait one second, I have one other idea. | 17:38 |
| *** CIA-50 has joined #cc | 17:39 | |
| paulproteus | I think it has to do with how the history tree looks, but I'm not super sure. | 17:44 |
| paulproteus | Anyway, hold on another few minutes. | 17:44 |
| *** Bovinity has joined #cc | 17:45 | |
| paulproteus | I wrote the trivial merge tool and am trying it now. | 17:56 |
| paulproteus | Conflict resolution tool, that is to say. | 17:56 |
| *** UncleCJ2_ has quit IRC | 18:04 | |
| paulproteus | nkinkade, I wrote the trivial merge conflict resolver, and am resolving the conflicts now. | 18:12 |
| paulproteus | I think that a more history-aware merge system, like what bzr uses, would handle that way better. | 18:12 |
| nkinkade | paulproteus: Cool. | 18:14 |
| paulproteus | We add an OpenID plugin? | 18:19 |
| paulproteus | nkinkade, Do you know what "packages.orig" is about? | 18:22 |
| paulproteus | Does that ring a bell for you? | 18:22 |
| nkinkade | paulproteus: It doesn't ring a bell. | 18:24 |
| nkinkade | Where? | 18:24 |
| nkinkade | But it's not unlike me to make a copy of something with a .orig suffix. | 18:24 |
| paulproteus | It seems to be a part of the CiviCRM tree, both in 2.0.3 and later. | 18:25 |
| nkinkade | I messed up the Drupal install (db). | 18:28 |
| nkinkade | It was all nice, and then mistakenly re-imported the old backed up db ... now the update script just returns a blank page! | 18:28 |
| paulproteus | Er? | 18:29 |
| nkinkade | I'll fetch last nights backup. | 18:29 |
| paulproteus | Good thinking. | 18:29 |
| paulproteus | I'd save a snapshot of your "broken" one first. | 18:30 |
| paulproteus | Just in case. | 18:30 |
| nkinkade | I had meant to re-import the CiviCRM db and there was a file lying around cc_support_staging.sql and I momentarily lapsed and forgot that was Drupal, not CiviCRM. | 18:30 |
| nkinkade | Overwrote the good, updated DB with the old one. | 18:30 |
| nkinkade | It should be easy enough to recover. | 18:30 |
| paulproteus | )-: | 18:31 |
| paulproteus | I should show you how to reproduce the merge I just got. | 18:33 |
| paulproteus | I'll send you an email. | 18:33 |
| nkinkade | Okay, Drupal is back in business. | 18:35 |
| nkinkade | nathany: /license? | 18:36 |
| nkinkade | You updating right now? | 18:36 |
| nathany | yes | 18:36 |
| nkinkade | Cool. | 18:36 |
| nathany | i stupidly forgot to run buildout before attempting to restart the service | 18:38 |
| nkinkade | I did see buildout in the process list. :-) | 18:39 |
| nathany | nkinkade: Bovinity: paulproteus: mlinksva: if you can spot check http://creativecommons.org/license/ I'd appreciate it | 18:40 |
| paulproteus | Okay, one sec. | 18:40 |
| paulproteus | nathany, It appears to work. What else would you like to know? | 18:41 |
| Bovinity | nathany: waiver text isn't showing up (404) on CC0 chooser | 18:41 |
| nathany | if it generates what appear to be sane results | 18:41 |
| nathany | Bovinity: just noticed that, fixing | 18:42 |
| nkinkade | Seems fine to me. | 18:42 |
| paulproteus | http://creativecommons.org/license/ still links to http://creativecommons.org/license/publicdomain-2 | 18:43 |
| nathany | which is correct | 18:43 |
| nathany | no? | 18:43 |
| nkinkade | paulproteus: Are you confusing PD with CC0? | 18:44 |
| Bovinity | afai remember, that's correct for PD | 18:45 |
| Bovinity | dorky, but correct | 18:45 |
| nathany | what Bovinity said :) | 18:46 |
| mlinksva | looks good to me | 18:47 |
| nathany | nkinkade: can you take a look at the rewrite rules for cc.org | 18:50 |
| nathany | http://creativecommons.org/licenses/zero/1.0/legalcode-plain is getting caught but i can't figure out where | 18:50 |
| nathany | (since i think all the legalcode URLs end with $) | 18:50 |
| nathany | and the one that has a [a-z-]+ on it has a dot, not a dash | 18:51 |
| nkinkade | nathany: I'll take a look. | 18:51 |
| nathany | thanks | 18:52 |
| nkinkade | paulproteus: Thanks for "theirs" ... that's pretty good. | 18:52 |
| nathany | i think i just need another set of eyes | 18:52 |
| nkinkade | nathany: So that URL should be going to zope? | 18:52 |
| nathany | yes | 18:52 |
| nathany | oh | 18:53 |
| nathany | i forgot we moved that dispatch into varnish | 18:53 |
| nathany | maybe the problem is there? | 18:53 |
| nathany | yup | 18:53 |
| nkinkade | nathany: So you'll handle this from here? | 18:54 |
| nathany | uh, maybe :) i need to look at the varnish conf and see what makes sense to me | 18:54 |
| nathany | i may run it by you | 18:54 |
| nathany | nkinkade: is there a program for varnish like apachectl configtest | 19:05 |
| nathany | to make sure my vcl is sane? | 19:06 |
| nathany | (or can you look @ creativecommons.vcl on a5?) | 19:06 |
| nkinkade | nathany: not that I know of. | 19:06 |
| nathany | does my change look sane to you? | 19:07 |
| nkinkade | nathany: Does .* also match a directory traversal? | 19:07 |
| nkinkade | I forget. | 19:07 |
| nkinkade | I'll look at man vcl. | 19:07 |
| nathany | er, if it's a perl-style regular expression it should match any character | 19:07 |
| nathany | i should probably at least change it to .+ | 19:08 |
| nkinkade | But I think the VCL is a little different in that you don't need to escape forward slashes. | 19:08 |
| nkinkade | So I don't think it totally pcre. | 19:09 |
| nkinkade | But it looks good enough to try out. | 19:09 |
| nathany | ok | 19:09 |
| nkinkade | I don't think it would cause Varnish to crash or anything. | 19:09 |
| nathany | well that's a relief ;) | 19:09 |
| nathany | whats the best way to reload the configuration? | 19:09 |
| nathany | /etc/init.d/varnish restart? | 19:09 |
| nkinkade | Yeah, that should do it. | 19:10 |
| nathany | ok | 19:10 |
| nathany | here goes | 19:10 |
| nkinkade | You can actually load and unload VCL files from the command line, | 19:10 |
| nkinkade | So you could create a sample one, then load it into the live server without ever having to restart | 19:11 |
| nathany | that seems to have done it | 19:11 |
| nathany | cool | 19:11 |
| nkinkade | Okay, so .* does match / :-) | 19:11 |
| nkinkade | I've never tried that functionality with Varnish, but I know that there are quite a few things that can be done by telneting to it. | 19:12 |
| nkinkade | nathany: Looking at it closer, could we not just add "licensecode-plain" to the first rule: | 19:16 |
| nkinkade | "^/(license|characteristic)/" | 19:16 |
| nkinkade | Ah, didn't see the ^ | 19:17 |
| nkinkade | nm | 19:17 |
| nathany | right | 19:17 |
| nathany | and that's for /license/ | 19:17 |
| nathany | legalcode-plain is in /licenses/ | 19:17 |
| *** cacimar has joined #cc | 19:56 | |
| nkinkade | paulproteus: So far so good with the CiviCRM thing and your altered git-mergetool. | 20:20 |
| *** UncleCJ2_ has joined #cc | 20:23 | |
| paulproteus | nkinkade, Great, I'm glad that is making sense. | 20:33 |
| paulproteus | nathany, Yes, it is correct, it just feels silly. re: PD link | 20:33 |
| nkinkade | paulproteus: It's not making sense, but it's working, I think. | 20:33 |
| paulproteus | Hah, okay. | 20:33 |
| nkinkade | paulproteus: I've been doing the work in another branch on a9. It will be easy enough to supplant cc_staging with the work in my new branch? | 20:34 |
| *** keksschaf has joined #cc | 20:34 | |
| nkinkade | I can do it all again on cc_staging, but it'd be nice to not have to. | 20:34 |
| paulproteus | I don't quite understand your question? | 20:35 |
| nkinkade | I'm doing the upgrade on a branch I made called testing. | 20:35 |
| paulproteus | Great. | 20:35 |
| nkinkade | testing is just a clone of origin/cc_staging. | 20:35 |
| nkinkade | When I'm all done and testing is working great, how will then make that cc_staging? | 20:36 |
| nkinkade | Apparently I still don't really understand git. | 20:36 |
| paulproteus | I find that "gitk" makes things much easier to understand. | 20:36 |
| paulproteus | gitk --all will show you that origin/cc_staging is a label attached to a direct parent of the commit that you call "testing". | 20:37 |
| paulproteus | So all you need to do is push the commit that you call testing onto the remote name "cc_staging". That will be sensible because it will just push cc_staging forward in history. | 20:37 |
| nkinkade | Ah, that makes sense. I may have to ask you later how to push that commit. :-) | 20:38 |
| nkinkade | Maybe not. | 20:38 |
| paulproteus | I think the phrasebook says how to update a remote branch. | 20:39 |
| nkinkade | I think I'm going to have to do it again anyway. | 20:39 |
| paulproteus | Said enter to something you didn't want to? | 20:39 |
| nkinkade | When I was deleting files with git-mergetool, in one case the remote file was modified but our local copy was deleted, but I chose to (d)elete by accident. | 20:40 |
| nkinkade | Before I started hitting Enter to select the default, like you instructed. | 20:40 |
| nkinkade | I was careless and didn't note which file. | 20:40 |
| paulproteus | You can just check out that file if you... oh, you don't know which file. | 20:41 |
| nkinkade | Surely the omission will rear it's head at some point. | 20:41 |
| paulproteus | I made a mistake like that, which is why I modified git-mergetool. | 20:41 |
| nkinkade | It's all in a testing branch anyway, and it's easy to redo it all, except hitting Enter about 50 times. :-) | 20:41 |
| *** deadcow has joined #cc | 20:48 | |
| *** deadcow has left #cc | 20:49 | |
| *** cacimar has quit IRC | 21:01 | |
| nkinkade | paulproteus: It's git-mergetool that leaves a .orig copy of everything it touched? | 21:04 |
| paulproteus | Good point; I need to fix "theirs" to remove the other files. | 21:10 |
| paulproteus | It's safe to remove them; I'll make a note that I should fix up "theirs" that way. | 21:10 |
| paulproteus | git clean -f # will remove all uncommitted files | 21:11 |
| paulproteus | (without -f, git clean only prints what it would remove, rather than doing it; -f makes it not a dry run) | 21:11 |
| nkinkade | paulproteus: I've used git clean a few times in the past few days :-) | 21:11 |
| paulproteus | Great. (-: | 21:12 |
| nkinkade | There may be a couple files that are unknown that I want to hang around. | 21:12 |
| nkinkade | I'll start by removing all the *.orig files | 21:12 |
| paulproteus | Possibly. | 21:12 |
| nkinkade | Interestingly there are also lots of REMOTE and BACKUP files laying around. | 21:12 |
| paulproteus | Yeah, those are also things I forgot to rm. | 21:14 |
| nkinkade | I'll blast them. | 21:14 |
| nkinkade | I sure hope CiviCRM doesn't have any real files named like "*.{BASE,REMOTE,LOCAL,BACKUP}.*" | 21:17 |
| paulproteus | "git status" will tell you, anyway! | 21:19 |
| nkinkade | paulproteus: Why would git be complaining about files that are part of .gitignore? | 21:25 |
| nathany | nkinkade: have you done git add on .gitignore? | 21:29 |
| nathany | (since you added those files) | 21:29 |
| paulproteus | nkinkade, No-eyed deer. | 21:31 |
| nkinkade | nathany: the .gitignore has been there for a while. | 21:31 |
| nathany | ok, just a suggestion :) | 21:32 |
| nkinkade | git refuses to let me commit until they are merged, but when I went to try to add it it complained that the file was one in my .gitignore! | 21:32 |
| nkinkade | wuzzup? | 21:32 |
| nathany | wait, it's complaining about a file in your .gitignore or it's objecting because it's in .gitignore | 21:32 |
| nathany | (whatever the answer, i'm sure git is behaving in a way that's internally consistent, technically pure and utterly obtuse to mortals) | 21:33 |
| nkinkade | it's objecting because the file is covered by a pattern in .gitignore. | 21:33 |
| nkinkade | haha | 21:33 |
| paulproteus | nkinkade, Well, CiviCRM added some files that your .gitignore said to ignore. | 21:33 |
| paulproteus | As I understand it, that would be the reason. | 21:33 |
| nkinkade | So paulproteus, I think those files should in fact be ignored. | 21:34 |
| paulproteus | Well, they're part of svn now. | 21:34 |
| nkinkade | They are part of the generated ones we talked about with dlobo. | 21:34 |
| * paulproteus nods | 21:34 | |
| nkinkade | in the ./sql/ dir | 21:34 |
| nkinkade | paulproteus: What's the resolution? | 21:35 |
| nkinkade | Just delete the mutha? | 21:35 |
| paulproteus | http://code.creativecommons.org/viewgit?p=civicrm.git;a=tree;f=sql;h=0b33d5290cfa65c0de18023518aac7d1158e3280;hb=85cb3e6a856cc6bf4c6d3ea8c940fdea6550cc44 is svn trunk; do you see those files? | 21:35 |
| paulproteus | (Serious question! Maybe they're not in svn, and I'm totally nuts.) | 21:35 |
| nkinkade | Yeah, they are there. | 21:35 |
| paulproteus | I guess you could "git add" them, and ignore changes to them. | 21:35 |
| paulproteus | Blah. | 21:35 |
| nkinkade | GenerateData.php and civicrm_generated.mysql | 21:36 |
| paulproteus | It's up to you; I don't recall what difference it would make for you, but keeping them in git would minimize the delta against upstream svn. | 21:36 |
| nkinkade | paulproteus: I tried to git add them and git didn't seem to want to let me do it because they were part of .gitignore | 21:36 |
| paulproteus | Right, so tell it to force it or something. | 21:36 |
| paulproteus | That is, if you want to add them. | 21:36 |
| paulproteus | Which I guess I would (and keep them ignored, so that your local changes to them don't get versioned). | 21:37 |
| nkinkade | paulproteus: I guess I can try to alter .gitignore to not ignore those files but /sql/* was so easy. | 21:37 |
| paulproteus | nkinkade, Keep in mind that "git add --force" will let you add them. | 21:38 |
| paulproteus | I'm no longer sure what we're talking about. | 21:38 |
| *** TRD is now known as TRD|Zzz | 21:38 | |
| nkinkade | Surprisingly -f "forces" git-add to add. | 21:39 |
| nkinkade | Who would have guessed that, those infernal git developers! | 21:39 |
| nathany | paulproteus: have you seen hg's built-in graph browser? | 21:44 |
| nathany | http://selenic.com/repo/index.cgi/hg/graph/43cfbb21f04d | 21:44 |
| paulproteus | hgweb's, you mean. | 21:44 |
| paulproteus | Very nice! | 21:44 |
| nathany | I mean hg's since it's included with hg :) | 21:45 |
| paulproteus | Very well. (-: | 21:45 |
| nathany | woah, check out http://selenic.com/repo/index.cgi/hg/graph/11a4eb81fb4f | 21:45 |
| nathany | pretty :) | 21:45 |
| paulproteus | Yes, but also confusing.... | 21:46 |
| paulproteus | Bisecting that for a bug sounds like no fun. | 21:46 |
| nathany | (i'm dreaming of faster merging for the license engine and deeds right now) | 21:46 |
| paulproteus | Ah-hah. | 21:46 |
| nathany | apparently there's a faster, canvas based theme available now | 21:47 |
| nathany | hopefully it labels the branches on the lines | 21:47 |
| nkinkade | Are we going to add a 3rd VCS into the mix? | 21:47 |
| nathany | nkinkade: i'd rather not | 21:48 |
| nathany | i'm just disappointed over the past few days; i had made the decision to just suck it up and learn to love git | 21:49 |
| nathany | and then i encountered the community | 21:49 |
| nkinkade | And it left you wanting? | 21:49 |
| nathany | (note: they didn't do anything wrong, I just had my "feelings hurt", so to speak) | 21:49 |
| nathany | i didn't feel... welcomed :) | 21:49 |
| nkinkade | On IRC? | 21:49 |
| nathany | 21:49 | |
| nathany | Bovinity: weren't we going to do away with the circle-CC on the zero? | 21:50 |
| nathany | http://creativecommons.org/licenses/zero/1.0/ | 21:50 |
| nkinkade | I haven't dealt with the community yet. I just use paulproteus for one stop shopping and and a way to avoid RTFM. | 21:50 |
| nathany | i imagine there's an unmerged change on ccwordpress, maybe faster for you? | 21:50 |
| nathany | heh | 21:50 |
| paulproteus | nathany, FWIW the emails from the maintainer were much better, and that random dude who flamed your top-posting could have been a doppelganger of my annoying high-school self.... | 21:50 |
| paulproteus | (And he was gentle, if still annoying.) | 21:50 |
| nathany | you mean both of them? | 21:51 |
| paulproteus | Yeah, I guess I mean both of them. | 21:51 |
| nathany | there were two replies that both a)ignored my question and b)flamed my top posting | 21:51 |
| nathany | anyway, like i said, it's my ego, nothing more | 21:51 |
| nathany | and you're right, the maintainer did great | 21:51 |
| paulproteus | nathany, re: Emacs org mode: | 21:53 |
| nkinkade | By the way, nathany, I was glad you mentioned Linode. I got one, and dropped my old Dreamhost account. $10/mo more and it's totally worth it. | 21:53 |
| nathany | cool :) | 21:53 |
| paulproteus | nkinkade, Yay! | 21:53 |
| nathany | i'm considering doing something similar, but webfaction is so damn good | 21:53 |
| paulproteus | nkinkade, Or you could save up for a server and send it to Joi for colo! | 21:53 |
| paulproteus | When you change #+SEQ_TODO: at the top, is there a way to have Org Mode reload that for the file? | 21:54 |
| paulproteus | Oh, I guess possibly I could kill the buffer and re-open the file. | 21:54 |
| nkinkade | For the price of a 1970 cup of coffee, I get my very own Debian system and a unique IP. | 21:54 |
| paulproteus | (a month) | 21:54 |
| nathany | paulproteus: i think C-c C-c on that line will do so | 21:54 |
| nkinkade | (per day, sorry) | 21:54 |
| nathany | i remember reading that there is a shortcut to make org-mode re-parse the file | 21:54 |
| nkinkade | (and confusingly I was referring to the price diff. between Dreamhost and Linode) | 21:55 |
| paulproteus | nkinkade, Yes, all in all, that is very confusing. | 21:55 |
| paulproteus | Yes, C-c C-c does the trick! | 21:55 |
| nathany | paulproteus: i wound up defining a couple of custom TODO sequences in my .emacs.d/init.el | 21:56 |
| nathany | and then that's stored in dvcs as well | 21:56 |
| paulproteus | That's very sensible. | 21:56 |
| paulproteus | I'm sticking to one file and configuring it all in there until I decide I want more. | 21:57 |
| nathany | ah | 21:57 |
| nathany | also a sensible approach | 21:57 |
| nathany | Bovinity: i went ahead and just copied over the icon | 21:57 |
| nkinkade | paulproteus: So now that I've got the testing branch where I want it and have commited all the changes locally, shouldn't I be able to git-push to push the changes in testing to the remote repository (cc_staging) that it's tracking? | 21:59 |
| paulproteus | nkinkade, Sounds good to me. | 22:00 |
| nkinkade | paulproteus: Nothing happens when I do it. | 22:00 |
| *** keksschaf has left #cc | 22:00 | |
| nkinkade | You can see it on a9:/var/www/zupport.creativecommons.org/www/sites/default/modules/civicrm | 22:00 |
| nkinkade | My commit is in the log. | 22:01 |
| paulproteus | I'm not entirely sure about the relationship between push and tracking branches. | 22:01 |
| nkinkade | But git-push only complains about not being able to push master. | 22:01 |
| paulproteus | I'm a lamer and just do "git push origin $LOCAL:$REMOTE" when I push, typically. | 22:02 |
| nkinkade | paulproteus: I try it the long-hand way. | 22:02 |
| nkinkade | Or are you in there about to do it? | 22:03 |
| paulproteus | I won't. | 22:03 |
| nkinkade | paulproteus: That seems to have done it. | 22:03 |
| paulproteus | As it should. | 22:04 |
| nkinkade | And did. | 22:05 |
| nkinkade | And it also avoids that ugly warning about master and fast-forward. | 22:07 |
| *** jgay has quit IRC | 22:10 | |
| mlinksva | nkinkade, the jurisdiction sidebar on http://creativecommons.org seems to be stuck at new year's eve | 22:11 |
| nkinkade | mlinksva: That can't be good. I'll have a look. | 22:14 |
| *** UncleCJ2_ has quit IRC | 22:22 | |
| *** mlinksva has quit IRC | 22:36 | |
| *** mlinksva has joined #cc | 22:40 | |
| *** nathany has quit IRC | 22:57 | |
| *** nathany has joined #cc | 23:11 | |
| nkinkade | mlinksva: The problem with the jurisdiction feed on the front page has to do with the caching mechanism of the builtin RSS fetching code of WP (Magpie). | 23:12 |
| nkinkade | For the moment I have just disabled caching, but I'll keep looking for the ultimate cause on staging. | 23:13 |
| mlinksva | nkinkade, thanks. | 23:21 |
| *** TRD|Zzz has quit IRC | 23:30 | |
| *** TRD|Zzz has joined #cc | 23:30 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!