| nkinkade | How about a conditional [Edit] next to "Discuss this page" that only shows once you are viewing the Talk page? | 00:00 |
|---|---|---|
| nkinkade | I can use the same logic that is used in the Footer links. | 00:00 |
| nkinkade | I think | 00:00 |
| Bovinity | i think the edit link should appear somewhere in the main content area | 00:04 |
| Bovinity | sidebar would work, for a quick and easy fix | 00:04 |
| nkinkade | Bovinity: How about this: | 00:07 |
| nkinkade | We'll just display the "Views" menu at all times, not just when someone is logged in. | 00:07 |
| nkinkade | http://wiki-staging.creativecommons.org/Marking | 00:08 |
| nkinkade | Might require to move the login box upward for visibility. | 00:08 |
| Bovinity | nkinkade: yeah, i think it should be visible at all times, pretty standard wiki links | 00:09 |
| nkinkade | I'll get it lookign a little better, then send the link here for your review. | 00:09 |
| nkinkade | http://wiki-staging.creativecommons.org/Marking | 00:12 |
| nkinkade | Bovinity: ^^ | 00:12 |
| nkinkade | It somewhat displaces the previous links, but it seems important to have those standard wiki tools at arms reach. | 00:13 |
| Bovinity | nkinkade: "Upload File" should only appear for logged in people | 00:13 |
| Bovinity | "special pages" too, i suppose | 00:13 |
| nkinkade | Hmm. I are confuse., | 00:16 |
| nkinkade | The loop that creates the menu at the bottom is the apparently the same one that creates the sidebar, but the content is different. | 00:17 |
| *** nathany has quit IRC | 00:24 | |
| *** nkinkade has left #cc | 00:33 | |
| *** jgay has joined #cc | 01:05 | |
| *** stevel has quit IRC | 01:30 | |
| *** Bovinity has quit IRC | 01:35 | |
| *** mlinksva has quit IRC | 01:37 | |
| *** [mharrison] has joined #cc | 02:04 | |
| *** ProperNoun has joined #cc | 02:33 | |
| *** jgay has quit IRC | 02:39 | |
| *** [mharrison] has quit IRC | 03:51 | |
| *** geniice has quit IRC | 04:21 | |
| *** [mharrison] has joined #cc | 04:24 | |
| *** tanjir has joined #cc | 04:40 | |
| *** les has joined #cc | 05:16 | |
| *** tanjir has quit IRC | 06:12 | |
| *** [mharrison] has quit IRC | 07:35 | |
| *** [mharrison] has joined #cc | 07:43 | |
| *** bhutan has joined #cc | 08:15 | |
| *** bhutan has quit IRC | 08:23 | |
| *** UncleCJ2_ has joined #cc | 09:39 | |
| *** sama has joined #cc | 10:28 | |
| *** balor has joined #cc | 10:28 | |
| *** macado has quit IRC | 10:43 | |
| *** TRD|Zzz is now known as TRD | 11:23 | |
| *** les has left #cc | 11:45 | |
| *** TRD is now known as TRD|Away | 12:05 | |
| *** balor has quit IRC | 12:14 | |
| *** GEN0VA has joined #cc | 12:18 | |
| *** GEN0VA has left #cc | 12:18 | |
| *** TRD|Away has quit IRC | 13:00 | |
| *** TRD|Away has joined #cc | 13:02 | |
| *** balor has joined #cc | 13:36 | |
| *** CIA-35 has quit IRC | 13:57 | |
| *** CIA-36 has joined #cc | 14:05 | |
| *** User858 has joined #cc | 14:06 | |
| User858 | Hello | 14:06 |
| User858 | need cc number | 14:06 |
| *** balor has quit IRC | 14:06 | |
| User858 | help me pls | 14:07 |
| *** User858 has quit IRC | 14:08 | |
| *** User815 has joined #cc | 14:08 | |
| *** User815 has quit IRC | 14:10 | |
| *** Need-CC has joined #cc | 14:10 | |
| *** Need-CC has quit IRC | 14:11 | |
| *** Need-CC has joined #cc | 14:11 | |
| Need-CC | see cc | 14:18 |
| Need-CC | !seen cc | 14:18 |
| ProperNoun | Um, #cc, it might help if you ask me about _someone_... | 14:18 |
| Need-CC | !seen Credit | 14:19 |
| ProperNoun | Um, #cc, it might help if you ask me about _someone_... | 14:19 |
| *** Need-CC has quit IRC | 14:31 | |
| *** mlinksva has joined #cc | 14:37 | |
| *** dgvdfgdg has joined #cc | 14:38 | |
| *** TRD|Away has quit IRC | 14:45 | |
| *** BillyCrook has left #cc | 15:17 | |
| *** paradroid has joined #cc | 15:33 | |
| paradroid | Hi, I am looking for some "definite" answers as to how to embed CC-metadata into files, esp. audio (Ogg Vorbis, MP3) and image (JPG). Currently I am confused about what (URL, verification link, license name) should go where (EXIF, XMP, license, copyright, URL, comment, ...). Any help is very welcome. | 15:38 |
| *** sama has quit IRC | 15:46 | |
| *** nathany has joined #cc | 15:53 | |
| *** nkinkade has joined #cc | 16:00 | |
| paulproteus | Hi paradroid. | 16:01 |
| paulproteus | Have you seen the http://wiki.creativecommons.org/Embedding page? | 16:01 |
| *** dgvdfgdg has quit IRC | 16:04 | |
| paradroid | paulproteus: Yes, I have. I am still somewhat confused how to properly go about this practically but I'll try and figure that out. Thanks for mentioning the wikipage. | 16:13 |
| paulproteus | paradroid, Sure. Ask me for specifics on any file type and I will answer. | 16:13 |
| paulproteus | If necessary, i will fix a wiki page. (-: | 16:14 |
| paradroid | paulproteus: The theoretical aspects of marking files are quite clear to me (I think so at least), it's the practical side that causes trouble, e. g. what software tools are the appropriate ones. The liblicense package e. g. keeps segfaulting and also claims certain licenses non-existant. The powerful Perl-app exiftool lets me write to every field you can think of whereas e. g. id3 knows only very basic fields. | 16:19 |
| paradroid | It's just all very inconsistent to me. | 16:19 |
| paradroid | Canonical field names for Ogg Vorbis as defined by Xiph include License and Copyright but nothing specifically for the web statement... | 16:20 |
| *** stevel has joined #cc | 16:26 | |
| paulproteus | paradroid, liblicense 0.8.1 avoids most of these segfaults and generally wrks. | 16:28 |
| paulproteus | Have you tried that newer release? | 16:28 |
| paulproteus | I'm really glad you're using it, and I'm happy to fix critical bugs you do find. | 16:28 |
| paradroid | There's no version-switch, is there? ;) | 16:30 |
| paradroid | Anyway, my repistory offers me the 0.8.1-release anyhow. | 16:30 |
| paulproteus | Hmm, we should have a version switch. | 16:31 |
| * paulproteus files an issue | 16:31 | |
| *** skyfaller has joined #cc | 16:31 | |
| paulproteus | Yo skyfaller. | 16:31 |
| paulproteus | Long time no see. | 16:31 |
| skyfaller | :) | 16:31 |
| *** UncleCJ2__ has joined #cc | 16:31 | |
| *** UncleCJ2_ has quit IRC | 16:32 | |
| paulproteus | paradroid, Okay, I'll make a --version <http://code.creativecommons.org/issues/issue126>. | 16:34 |
| paulproteus | paradroid, It does segfault if you give it bad arguments, but it shouldn't segfault on files. | 16:35 |
| paradroid | paulproteus: I have not really played with it a lot so it may just as well be my inexperience. :) | 16:36 |
| paulproteus | I'm here to help. (-: | 16:36 |
| paradroid | OK... you asked for it. :) | 16:37 |
| paradroid | The -l switch e. g. is said to "Use the license with URI instead of default" but when I feed it e. g. http://creativecommons.org/licenses/by/3.0/de/ it tells me "does not exist". | 16:37 |
| *** skyfaller has left #cc | 16:38 | |
| paulproteus | Hmm, let me see if I can reproduce that. | 16:42 |
| paulproteus | Yup, I can. | 16:42 |
| paulproteus | Now let me check why it happens. | 16:42 |
| paulproteus | Clearly I should have a --force option to override that anyway. | 16:43 |
| *** nkinkade has quit IRC | 16:43 | |
| *** nkinkade has joined #cc | 16:43 | |
| paulproteus | paradroid, FYI I'm filing tickets that you can see at http://code.creativecommons.org/issues/ for these issues. | 16:44 |
| paulproteus | And good morning to the pair of Nathans. | 16:44 |
| nkinkade | Hey paulproteus. | 16:46 |
| nkinkade | In a few minutes I may have some questions for you about Drupal and git. | 16:47 |
| paulproteus | Great. | 16:47 |
| paulproteus | paradroid, Okay, without the .de it does work. | 16:47 |
| paradroid | paulproteus: Yes, sorry, I could have told you... | 16:47 |
| paulproteus | No big deal. | 16:47 |
| paulproteus | Let me add a test for that now and see why it fails. | 16:48 |
| paradroid | paulproteus: Another minor issue which is a question of understanding: in what form should the default license be specified in ~/.license | 16:48 |
| paulproteus | I think it is just read in as a string and any trailing whitespace trimmed. | 16:49 |
| paulproteus | We could be clearer about that in e.g. the man page, though. | 16:49 |
| paulproteus | nathany, I think I'll spend the morning on paradroid's liblicense issues and nkinkade's drupal.git stuff... | 16:49 |
| *** UncleCJ2__ has quit IRC | 16:50 | |
| nathany | paulproteus: sounds good; make sure you file a bug re: paradroid's issue | 16:51 |
| paulproteus | I'm filing lots of tickets. | 16:51 |
| paulproteus | paradroid, The issues that bothers me the most is the /de/ failure. | 16:52 |
| paulproteus | I'm looking into that now. | 16:52 |
| paradroid | paulproteus: :) Don't let it get to you too much! | 16:52 |
| paulproteus | I mean in a professional sense. (-: | 16:53 |
| mlinksva | nkinkade: are you certain that http://creativecommons.org/licenses/index.rdf is up to date? i have no reason to think it is not, just checking before i use it as a reference | 16:55 |
| paradroid | paulproteus: Sry for all the stuff I'm asking, I'm starting to feel bad about it - but the default license still keeps me confused. A simple .license file containing an URI (e.g. http://creativecommons.org/licenses/by/3.0/) makes liblicense tell me "Failed to make directory. Error: No default license set". Without a file/directory .license such a directory is created... leaving me wondering what should go there. | 16:57 |
| paulproteus | Please don't feel bad! I'm happy to help. | 16:57 |
| paulproteus | ...setting the default license doesn't seem to do anything. | 17:02 |
| paulproteus | paradroid, Any other issues you're having? | 17:06 |
| paulproteus | And how long will you be around? | 17:06 |
| paulproteus | I can try to get these fixed in the next couple of hours. | 17:06 |
| paulproteus | And feel free to sign up for our issue tracker and file issues directly. | 17:06 |
| paradroid | paulproteus: It's not an urgent thing for me at all. I'm actually just playing around with it atm. | 17:06 |
| paulproteus | Yes, but these should be fixed! | 17:07 |
| paradroid | :) | 17:07 |
| paulproteus | All the more reason to file it now; if you do need it sometime, you'd be able to find it fixed. | 17:07 |
| paulproteus | How did you find out about it, and what are you thinking of using it for, out of curiosity? | 17:07 |
| paradroid | Well, I was trying to figure out a way to embed CC-metadata into different works of mine that range from audio to image. | 17:08 |
| paradroid | I didn't feel much like using different tools for that that modify ID3-tags, headers, whatever so I stumbled across ccPublisher which wouldn't work and somehow ended up with liblicense ;) | 17:09 |
| paulproteus | Via the CC wiki, maybe? | 17:09 |
| paradroid | Actually liblicense popped up with "apt-cache search creative commons" | 17:10 |
| paulproteus | Oh, awesome. | 17:10 |
| paradroid | Didn't read about it anywhere else. | 17:10 |
| paradroid | CC really need some super-user-friendly tools for creators that are not that tech-savvy (like me) | 17:11 |
| paulproteus | Super rad. | 17:11 |
| paulproteus | Yes, but we also could do with fixing our tools for tech-savvy creators. (-: | 17:11 |
| paulproteus | Actually Steren Giannini is working on a more user-friendly tool on top of liblicense. | 17:11 |
| paulproteus | But getting the word out will be a somewhat difficult problem. | 17:12 |
| nkinkade | mlinksva: I have no reason to believe that that file /index.rdf should be out of date. | 17:13 |
| nkinkade | It's at the latest svn revision. | 17:13 |
| nkinkade | The actual file is http://creativecommons.org/rdf/index.rdf, but there must be a redirect. | 17:14 |
| nathany | nkinkade: is it redirecting or rewriting? | 17:15 |
| nathany | paulproteus: if i'm in the middle of a conflicted merge and i've fixed the conflict, what's the incantation to commit that? | 17:15 |
| nathany | "git commit foo" tells mefatal: cannot do a partial commit during a merge. fatal: cannot do a partial commit during a merge. | 17:15 |
| paulproteus | git add $fixed_file | 17:15 |
| paulproteus | git commit -m 'message' | 17:15 |
| nathany | thanks | 17:16 |
| nathany | i think i expected just doing git commit with a path to implicitly add like it normally does | 17:16 |
| paulproteus | I do think git is right that you have to resolve all the conflicts before you can merge. | 17:16 |
| nathany | right, it was the add/commit behavior that tripped me up | 17:16 |
| paulproteus | But if "git add $whatever; git commit -m ..." works, and "git commit $whatever -m ..." doesn't, then that's a bug and I'll complain about it on the git list. | 17:16 |
| nathany | let me pastebin my history and you can verify | 17:17 |
| paulproteus | Super rad. | 17:17 |
| nkinkade | nathany: rewriting | 17:17 |
| nathany | nkinkade: great | 17:17 |
| nathany | paulproteus: http://pastebin.com/m3e02888c | 17:18 |
| nathany | i flailed around a little but i think it's a bug | 17:19 |
| paulproteus | I meant to email you to ask what you're using; are you using http://members.optusnet.com.au/~charles57/GTD/gtd_workflow.html ? | 17:24 |
| paulproteus | I'm thinking of trying that myself. | 17:24 |
| mlinksva | nkinkade: thanks. no redirect, but get the same file from both urls | 17:35 |
| nkinkade | mlinksva: Yes, the real file is at /rdf/index.rdf, but there is a rewrite rule so that the other URL works as well, and the rule has been there for a long time. | 17:36 |
| nkinkade | I just mention it in case you would have preferred to link to the actual file. | 17:37 |
| mlinksva | i would have, but ah well | 17:37 |
| nkinkade | Maybe the one at /licenses/ is more intuitive anyway? | 17:38 |
| mlinksva | it should probably redirect rather than do an internal rewrite, but don't bother today | 17:38 |
| paulproteus | Going offline for a bit, tty y'all later. | 17:38 |
| nkinkade | paulproteus: No! | 17:38 |
| nkinkade | ;-) | 17:38 |
| paulproteus | Er. | 17:38 |
| paulproteus | Okay. (-: | 17:38 |
| nkinkade | When will you be back? | 17:38 |
| paulproteus | ca. 1h I think | 17:38 |
| nkinkade | No biggie, just wanted to ask you some things about merging and Drupal, etc. | 17:38 |
| mlinksva | fwiw the one under /licenses has existed forever | 17:38 |
| nkinkade | paulproteus: I'll just catch you when you return. | 17:38 |
| paulproteus | Great. (I'll hack liblicense until then.) | 17:39 |
| nkinkade | mlinksva: Changing it to a redirect would be a matter of about 30 seconds. | 17:39 |
| nkinkade | So if you think you'd like to have it that way, then no time like the present. | 17:39 |
| mlinksva | nkinkade: i don't really care, just zero downtime for it today, as i've already posted the link in a wikipedia discussion | 17:42 |
| nkinkade | mlinksva: I'll just let sleeping dogs lie. | 17:42 |
| nkinkade | If it ain't broke, don't fix it. | 17:42 |
| mlinksva | nkinkade: exactly | 17:42 |
| nkinkade | Sadly, I didn't heed that advice with the wiki and anonymous Talk edits, so now I've got to go about fixing something that wasn't really broken. | 17:43 |
| nathany | nkinkade: yeah, don't rewrite -- the /rdf/... really shouldn't be exposed at all | 17:44 |
| nathany | mlinksva: ^^ | 17:44 |
| nathany | this is an artifact of the mixed zope/apache/blarf stuff... | 17:44 |
| nathany | sigh | 17:45 |
| nkinkade | Hey, I forgot that we had a UnifiedRoot TLD .commons | 17:45 |
| nkinkade | All our DNS issues are solved. | 17:45 |
| *** Bovinity has joined #cc | 17:45 | |
| nkinkade | I think it may have expired though. | 17:45 |
| nathany | mlinksva: do i understand correctly that you posted a link to cc.org/rdf/index.rdf in the wikipedia discussion? | 17:46 |
| nkinkade | nathany: No. | 17:46 |
| mlinksva | nathany: no licenses/index.rdf | 17:46 |
| nathany | ok, great | 17:46 |
| nkinkade | He posted to /licenses/index.rdf | 17:46 |
| nathany | excellent | 17:46 |
| nathany | that's the one we've always claimed to support | 17:46 |
| mlinksva | http://lists.wikimedia.org/pipermail/foundation-l/2009-January/049122.html | 17:46 |
| nathany | i don't think the direct /rdf/index.rdf is linked anywhere and should probably not be exposed | 17:46 |
| mlinksva | UR = scam IMO, though some of the scammers may be self-deluded | 17:47 |
| nkinkade | mlinksva: Have you tried to load that link up in your browser? | 17:48 |
| nkinkade | It works, but if I recall it will damn near crash Firefox, or render it a useless window for a good while. | 17:48 |
| mlinksva | i did try. it is a little slow, but no real problem | 17:48 |
| nkinkade | I was just kidding re: UnifiedRoot. | 17:48 |
| mlinksva | i forgot that UR uses <marquee>. i have a feeling of deja vu | 17:49 |
| mlinksva | they're using <marqee> to announce .widget tld, even better. | 17:49 |
| nkinkade | It's all on the up-and-up, you know. | 17:50 |
| nkinkade | Ha! They wanted 250 € to renew .commons! | 17:51 |
| *** ProperNoun has quit IRC | 17:52 | |
| mlinksva | nkinkade: i think we paid $1k to register. or l3l did | 17:53 |
| nkinkade | mlinksva: I hope that's a joke. But I did notice a rather strange password along the lines of sweetieBettina. :-) | 17:56 |
| mlinksva | nkinkade: reality is a joke, and it keeps getting better | 17:57 |
| nkinkade | You ain't just whistlin' Dixie. | 17:57 |
| mlinksva | You know I'm belting out GOD BLESS AMURRICUH | 17:58 |
| nkinkade | And if I know you, you spent all day yesterday reveling in those august inaugural proceedings. | 18:01 |
| nkinkade | Bovinity: Rather than figure out how to remove the "Upload file" link from the Toolbox on the wiki, I'm alright with just leaving it there. | 18:17 |
| nkinkade | Following it prompts for a login anyway. | 18:17 |
| Bovinity | nkinkade: ok | 18:18 |
| nkinkade | And Special pages are fine to be there too, I think. | 18:18 |
| nkinkade | They can be viewed by anyone anyway. | 18:18 |
| Bovinity | nkinkade: is there supposed to be a recaptcha on the talk edit page? or did you decide not to include it | 18:19 |
| nkinkade | Bovinity: There is one. | 18:20 |
| nkinkade | But only when someone tried to include external links. | 18:21 |
| nkinkade | *tries | 18:21 |
| Bovinity | ah | 18:21 |
| nkinkade | Bovinity: Now that those links will be on the side, I feel like it would be safe to remove the links from the footer. Does that seem reasonable to you? | 18:26 |
| nkinkade | Leaving last mod date and About CC Wiki. | 18:26 |
| nkinkade | Like this: http://wiki-staging.creativecommons.org/Talk:Marking | 18:27 |
| Bovinity | i think they're ok to leave there, so the links are accessible without scrolling back up | 18:28 |
| nkinkade | Bovinity: Done. It's live. | 18:44 |
| *** nathany has quit IRC | 18:47 | |
| *** nathany has joined #cc | 18:47 | |
| nathany | mlinksva: any reason for us to meet today? | 19:01 |
| mlinksva | nathany: other than to give me an excuse to procrastinate, i guess not, we're set from last week | 19:03 |
| nathany | yeah, I think the notes from last week all still apply :) | 19:04 |
| nathany | (btw, it's sort of weird having IRC be just another Emacs buffer :) ) | 19:04 |
| mlinksva | one can go a lot further, in terms of moving everything into emacs buffers :) | 19:05 |
| nathany | true... i actually ran across some lisp code that claimed to bring your Google contacts into BBDB | 19:10 |
| paulproteus | nathany, Wow, that is kind of weird! | 19:11 |
| nathany | yeah, but sort of amazing | 19:11 |
| nathany | and wrt your earlier question, that's not exactly the workflow I'm using but close | 19:12 |
| nathany | right now I have one org-mode file per "project" | 19:12 |
| paulproteus | For sure. | 19:12 |
| nathany | using some path structure to split personal and work projects | 19:12 |
| nathany | I need to write some custom agenda views -- right now I'm just using one that grabs everything with a TODO tag of NEXT | 19:13 |
| paulproteus | I will keep bugging you about this as time goes on, then. | 19:14 |
| paulproteus | Receiving objects: 67% (92/137), 195.99 KiB | 1 KiB/s | 19:14 |
| paulproteus | GPRS, how I love you. | 19:14 |
| paulproteus | (I do have your phone, but I'm not using it for some reason I have forgotten.) | 19:14 |
| paulproteus | (But what I love most is that that lousy 1KB/s is enough to sync my mail.) | 19:16 |
| greg-g | (you use git to sync maildirs?) | 19:17 |
| paulproteus | (yes) | 19:17 |
| paulproteus | But what I love even more is that nkinkade hasn't bugged me about the Drupal-git syncing, which is still broken. | 19:17 |
| paulproteus | Apparently someone else maintains a git mirror of Drupal CVS on github. | 19:19 |
| nathany | paulproteus: nkinkade should bug you about that... getting the upgrade moving is pretty high priority | 19:20 |
| paulproteus | I know, I'm just enjoying my time before he does. | 19:21 |
| paulproteus | (I'm also debugging it now.) | 19:21 |
| *** jgay has joined #cc | 19:21 | |
| *** bsperan has joined #cc | 19:23 | |
| bsperan | I see that some people include text file versions of the creative commons licenses in the .ZIP with downloadable content. But I can't seem to find the instructions on how to do this. | 19:25 |
| paulproteus | The people next to me in Union Station in DC are talking about programming COBOL in a CS ugrad degree in 1993. | 19:28 |
| Bovinity | whenever i see COBOL these days I think of BSG before the language. | 19:29 |
| paulproteus | Wow. | 19:30 |
| nathany | BTW, what's up with the whole my-dead-wife-is-the-fifth-and-i-killed-her shit? | 19:33 |
| nathany | Bovinity: ^^ | 19:33 |
| nathany | srsly | 19:33 |
| nathany | paulproteus: i'm once again having problems connecting to pypi.python.org from within the CC office | 19:39 |
| nathany | last time this happened it was annoying IPv6 bullshit | 19:39 |
| nathany | can you log in remotely and see if that's happening again? | 19:39 |
| nkinkade | paulproteus: I'll be happy to bother you about Drupal and git now. | 19:42 |
| *** isforinsects has quit IRC | 19:45 | |
| paulproteus | nathany, Yes, I'll see if that's going on. | 19:45 |
| paulproteus | Fixing, and removing the route advertising daemon. | 19:45 |
| paulproteus | Fixed and removed. | 19:45 |
| nkinkade | paulproteus: ^^-4 | 19:47 |
| paulproteus | Ya. | 19:48 |
| nkinkade | The Drupal repo being out of date is one issue, of course, but the other are these merge conflicts I'm getting. | 19:48 |
| paulproteus | It looks like the importer is working fine. | 19:48 |
| nathany | paulproteus: thanks | 19:48 |
| paulproteus | I... think. | 19:48 |
| paulproteus | nkinkade, I haven't seen those merge conflicts; tell me more. | 19:48 |
| nkinkade | I figured I'd get Drupal up to the latest our repo had (has?), which was 6.6. | 19:48 |
| nkinkade | paulproteus: So I created a branch whose HEAD is the commit that was 6.6. | 19:49 |
| nkinkade | Then I tried to merge that branch with cc_staging. | 19:49 |
| paulproteus | nkinkade, Which was what version before? | 19:49 |
| nkinkade | There must have been 20 or 30 conflicts. The first one I looked at didn't make sense to me. | 19:49 |
| nkinkade | 5.7 | 19:49 |
| *** isforinsects has joined #cc | 19:49 | |
| paulproteus | That seems pretty nuts to me. | 19:50 |
| nkinkade | Your cc_merged branch, or what I also tagged as cc_production | 19:50 |
| paulproteus | I would merge with each of the point releases between here and there. | 19:50 |
| * paulproteus nods | 19:50 | |
| nkinkade | The CHANGELOG.txt file had conflicts. | 19:50 |
| paulproteus | Hah. | 19:50 |
| paulproteus | I suppose I can try this. | 19:50 |
| paulproteus | lemme see. | 19:50 |
| nkinkade | And this was strange to me. | 19:50 |
| nkinkade | Do you want the commit that was 6.6? | 19:50 |
| nkinkade | You can probably find it easy enough. | 19:50 |
| paulproteus | Does Drupal tag releases or something? | 19:51 |
| paulproteus | I'm surprised to find only branch names, not tag names. | 19:51 |
| paulproteus | Yes, I'd love the commit ID of 6.6. | 19:51 |
| nkinkade | They branch the major version. | 19:51 |
| nkinkade | But the minor version are just commits with comments. | 19:51 |
| nkinkade | Let me get that commit SHA1 | 19:51 |
| paulproteus | Wow, okay. | 19:51 |
| paulproteus | So I'm not insane, they are. | 19:51 |
| paulproteus | That explains everything | 19:51 |
| nkinkade | bbdc7eb4df8c389430a3ae06ef0d50350123361c | 19:52 |
| nkinkade | So I was very surprised to see CHANGELOG.txt with conflicts, because it was precisely the same file, but with more changes listed at the top. | 19:52 |
| nkinkade | Which is what you'd expect. | 19:53 |
| paulproteus | Unless there were end-of-line related changes maybe? | 19:53 |
| nkinkade | Or, I should say, what *I'd* expect. | 19:53 |
| paulproteus | I'm curious what e.g. kdiff3 thinks the 3-way diff looks like. | 19:53 |
| nkinkade | Ah-ha. | 19:53 |
| nkinkade | There could have been some of that going on, I suppose. | 19:53 |
| paulproteus | I'd use kdiff3 and look at the delta. | 19:53 |
| nkinkade | I was so sad to see that kdiff3 was gone from Intrepid. | 19:53 |
| paulproteus | !? | 19:54 |
| paulproteus | Wow yeah. | 19:54 |
| nkinkade | I went to use git-mergetool and was sad to see some terrible gvim diff thing. | 19:54 |
| paulproteus | ...I wonder why. | 19:54 |
| paulproteus | It's still in Debian... | 19:54 |
| nkinkade | There's a bug about it, and people were complaining bitterly. | 19:54 |
| paulproteus | Beaterly, I'm sure. | 19:55 |
| nkinkade | That too. | 19:55 |
| nkinkade | So, paulproteus, on thing I wanted to check with you about was whether my merge strategy was correct, or viable. | 19:55 |
| nkinkade | To make a new branch based on the 6.6 commit, then try to merge. | 19:56 |
| paulproteus | I wouldn't do that; I'd just do the merge you said you did. | 19:56 |
| nkinkade | Seems that merge works with branches, not specific commits, except the cherrypick stuff. | 19:56 |
| paulproteus | re: conflicts: If you don't think you modified it, accept upstream. | 19:56 |
| paulproteus | There is no difference in git between branches and specific commits. | 19:56 |
| paulproteus | A branch is just a reference to a particular commit. | 19:56 |
| nkinkade | So I can do something like: git merge bbdc7eb4df8c389430a3ae06ef0d50350123361c | 19:57 |
| paulproteus | Sure. | 19:57 |
| nkinkade | I guess I should have known that. | 19:57 |
| nkinkade | I'll try it on my local copy. | 19:57 |
| paulproteus | Great. | 19:57 |
| paulproteus | https://bugs.launchpad.net/ubuntu/+source/kdiff3/+bug/260326 gives you a hilarious hack that helps you get kdiff3. | 19:58 |
| nkinkade | Loads of conflicts still. | 19:58 |
| nkinkade | I saw some of those, but decided to not worry about it for now. | 19:58 |
| nkinkade | paulproteus: Can you try the merge to see if you too get all the conflicts, and to be sure I'm not just doing something wrong, though it seems unlikely I am. | 19:59 |
| nkinkade | And do you use git-mergetool to resolve the conflicts or do you just try to do it manually? | 19:59 |
| paulproteus | git-mergetool for sure. | 19:59 |
| paulproteus | Which calls kdiff3 for me. | 19:59 |
| paulproteus | I guess I do my git merging on my desktop or something. | 19:59 |
| bsperan | So, nobody here is familiar with how to include a text file version of creative commons licenses in the .ZIP with downloadable content? | 20:00 |
| nkinkade | bsperan: Just add the HTML file. | 20:01 |
| nkinkade | Most every operating system in the world has at least 1 tool to read HTML. | 20:01 |
| nkinkade | Even purely text-based interfaces. | 20:01 |
| bsperan | I guess I could. But I've seen some cases where both the human readable and technical versions of the licenses were combined into a .TXT file with the download. They also precede the actual license info with the attribution info. I rather like the idea of combining the license and the attribution into one file. | 20:03 |
| bsperan | LICENSE.TXT | 20:03 |
| paulproteus | nkinkade, http://code.creativecommons.org/viewgit?p=drupal.git is up to date and should stay that way. | 20:05 |
| paulproteus | Including tags for the commits that release various Drupal versions (as created by Drupal). | 20:05 |
| nkinkade | paulproteus: Awesome, thanks. | 20:05 |
| paulproteus | It turns out that what I thought were fatal errors for months were just noise. | 20:06 |
| bsperan | That, and I want to include both a BY-NC and a BY-SA license for the same material and explain that the user can choose which license to use under. | 20:06 |
| paulproteus | So there's no problem, and I just adjusted the cron job to do the push. | 20:06 |
| nkinkade | paulproteus: And will you now attempt a merge? | 20:06 |
| paulproteus | nkinkade, If you'd like, one sec. | 20:06 |
| nkinkade | paulproteus: I'll pull and try it myself, but if you could also give it a whirl that would be great. | 20:07 |
| nkinkade | Just as a sanity check for me. | 20:07 |
| paulproteus | nkinkade, Er, maybe I clobbered the remote branches? | 20:07 |
| paulproteus | Yes, I did by accident. | 20:07 |
| paulproteus | Can you do me a favor and "git push origin cc_production:cc_production" and "git push origin cc_staging:cc_staging"? | 20:07 |
| paulproteus | I'll adjust these here scripts so that doesn't happen. | 20:07 |
| nkinkade | Doing that now. | 20:08 |
| nkinkade | paulproteus: They are restored. | 20:09 |
| paulproteus | There, script fixed. | 20:13 |
| *** isforins1cts has joined #cc | 20:13 | |
| nkinkade | paulproteus: I expect you got plenty of merge conflicts? | 20:15 |
| paulproteus | My bandwidth sucks, but I'm doing the merge now. | 20:20 |
| paulproteus | brb again. | 20:20 |
| *** UncleCJ2_ has joined #cc | 20:21 | |
| nkinkade | What device is your GPRS connection over? | 20:21 |
| mlinksva | nathany, Bovinity am I on my own for curry today? | 20:24 |
| nathany | mlinksva: i'll join you | 20:24 |
| *** isforinsects has quit IRC | 20:24 | |
| nathany | i think i owe you | 20:24 |
| Bovinity | not today | 20:25 |
| *** paradroid has quit IRC | 20:26 | |
| *** bsperan has quit IRC | 20:28 | |
| paulproteus | Just over a cheesy WinCE phone. | 20:28 |
| nkinkade | paulproteus: Looking at the diff between the two changelogs (5.7 -> 6.9) there are some bizarre changes, as if someone went in and "cleaned up" old changelog entries. By capitalizing, etc. | 20:28 |
| paulproteus | Hoo frickin ay. | 20:29 |
| paulproteus | "Recycling the past to meet immediate need." | 20:29 |
| nkinkade | So I guess that's why it's conflicting. | 20:29 |
| nkinkade | But that's just one file of perhaps dozens. | 20:29 |
| nkinkade | I hate the idea of manually sifting through them. | 20:29 |
| nkinkade | Especially with something like gvimdifftool, or whatever it is. | 20:29 |
| paulproteus | It's not *so* bad with kdiff3. | 20:30 |
| paulproteus | You should grab kdiff3. | 20:30 |
| paulproteus | kdiff3 (also Emacs emerge) is easy to power by the keyboard. | 20:30 |
| nkinkade | paulproteus: You mean just manually install it, or grab the package from the Debian repo? | 20:30 |
| paulproteus | Manually installing it from hardy would be fine. | 20:31 |
| nkinkade | On that note, I couldn't find much useful documentation about git-mergetool. | 20:31 |
| paulproteus | Better would be to grab the new source package from Debian experimental, which is based off Qt4 and KDE4. | 20:31 |
| nkinkade | I can probably just figure it out, but it would be nice to read a bit about it. | 20:31 |
| paulproteus | It has a man page, but it really is a dumb shell script. | 20:32 |
| *** grahl has joined #cc | 20:32 | |
| paulproteus | "All" it does is check what files have merge conflicts, and run your favorite merge tool on them. | 20:32 |
| paulproteus | The man page says a tiny bit more if you like. | 20:33 |
| nkinkade | I looked at the man already. | 20:33 |
| nkinkade | I'll try to get kdiff3 going. | 20:33 |
| nkinkade | I'm rather surprised that for all the talk about how developer-friendly Drupal is that they are still with a CVS source repository. | 20:34 |
| paulproteus | Yeah, it's pretty amazing. | 20:39 |
| nkinkade | Okay, that was fairly painless to get kdiff3 from Debian experimental. | 20:51 |
| nkinkade | Just a bit of waiting for a few dozen dependencies and some compiling. | 20:52 |
| nkinkade | Maybe not: | 20:55 |
| nkinkade | Hit return to start merge resolution tool (kdiff3): | 20:55 |
| nkinkade | Segmentation fault | 20:55 |
| paulproteus | Boom boom boom boom, mighty fine mergetool. | 20:55 |
| *** Mihai`` has joined #cc | 20:55 | |
| nkinkade | Well, I tried it again and it seems to be working. | 20:57 |
| *** jgay has quit IRC | 21:00 | |
| nkinkade | paulproteus: I'm lost with kdiff3 | 21:09 |
| nkinkade | I've got all 3 files up, but I can't figure out what to do now. I have a sense of what is supposed to happen, but I don't know how to make it happen. | 21:09 |
| paulproteus | Never used it before ever? | 21:10 |
| paulproteus | I see. | 21:10 |
| paulproteus | Use the menus, Luke. | 21:10 |
| paulproteus | And/or try http://kdiff3.sourceforge.net/doc/index.html | 21:10 |
| nkinkade | paulproteus: Never. I've only used kdiff3 to view things, not resolve things. | 21:11 |
| nkinkade | paulproteus: Is is that I need to make file BASE the file that I want git-mergetool to use? | 21:12 |
| nkinkade | And LOCAL and REMOTE are there to as references of the diffs? | 21:12 |
| paulproteus | The thing at the bottom is the output. | 21:13 |
| paulproteus | The top three things are the source. | 21:13 |
| paulproteus | The way it goes is: | 21:13 |
| paulproteus | LOCAL and REMOTE both have BASE in their history. | 21:13 |
| nkinkade | I didn't even see the bottom. It was totally collapsed. | 21:13 |
| paulproteus | http://kdiff3.sourceforge.net/doc/merging.html is most useful. | 21:13 |
| paulproteus | You probably want to choose C for all conflicts. | 21:13 |
| nkinkade | Now, I've expanded it, so that's a good start. | 21:13 |
| paulproteus | Great. | 21:14 |
| nathany | paulproteus: do you use offlineimap? greg-g, I think you do, right? | 21:34 |
| greg-g | nathany: yep | 21:34 |
| nathany | greg-g: did you decide to use it for disconnected ops, backup, or something else? | 21:35 |
| greg-g | I'm actually going to be writing up a blog post later this week about my email setup (offlineimap + imapfilter + mutt) | 21:35 |
| nathany | ah cool | 21:35 |
| greg-g | disconnected and backup | 21:35 |
| nathany | i was thinking of offlineimap + Emacs/GNUS | 21:35 |
| nathany | and for extra freaky points syncing the Google Contacts to Emacs BBDB | 21:36 |
| nathany | (which, if it worked, would mean I could edit a contact in Emacs and have it show up on my phone seamlessly :) ) | 21:36 |
| greg-g | the choice of mutt is because a few of the people I know around here use it and I can bounce ideas/config files off them | 21:36 |
| nathany | right | 21:36 |
| greg-g | neat-o | 21:36 |
| nathany | I actually like Alpine a lot (and have a similar resource in paulproteus) but remember-mode integrates with GNUS in an interesting way | 21:36 |
| greg-g | I shold check out alpine, give it a chance | 21:37 |
| greg-g | If my blog post is to be thurough, that is :) | 21:37 |
| nathany | lol... yup | 21:37 |
| greg-g | well, I need to run to a meeting | 21:38 |
| greg-g | take care | 21:38 |
| nathany | ttyl | 21:38 |
| nkinkade | paulproteus: I'm resolving conflicts one by one, but I see that one thing that confused me greatly was what appears to be an interface bug. | 21:47 |
| nkinkade | When git-mergetool launches kdiff3, it just shows an apparently blank window. If I grab with the mouse near the bottom and drag open the summary/merge area, then the interface fills in normally. | 21:48 |
| nathany | nkinkade: when you get a chance can you up the maximum execution time for PHP scripts on a9? | 21:52 |
| nathany | I'm doing some CiviCRM ops that are taking longer than 30 seconds to run. | 21:52 |
| nkinkade | nathany: Sure. I'll do it now. | 21:52 |
| nathany | thanks | 21:53 |
| nkinkade | nathany: Are you alright with me setting that in the CiviCRM config file instead of in the main php.ini? | 21:56 |
| nkinkade | I'd rather limit the extent of that setting. | 21:57 |
| *** dgvdfgdg has joined #cc | 21:58 | |
| dgvdfgdg | need cc nombers | 21:58 |
| *** dgvdfgdg has quit IRC | 21:59 | |
| *** dgvdfgdg has joined #cc | 21:59 | |
| *** dgvdfgdg has joined #cc | 22:00 | |
| *** dgvdfgdg has joined #cc | 22:00 | |
| *** dgvdfgdg has joined #cc | 22:00 | |
| nkinkade | nathany: I set the max_execution_time to 60 seconds. If you need to up or lower it, you can do so easily at ./sites/default/civicrm.settings.php (about 15 lines down). | 22:03 |
| *** grahl has quit IRC | 22:03 | |
| paulproteus | nkinkade, Great. | 22:04 |
| nathany | nkinkade: sorry, didn't see your earlier message; I think that's fine | 22:06 |
| nkinkade | We may have to change it for zupport, but we'll do it as needed. Those settings files are not version controlled. | 22:08 |
| *** [mharrison] has quit IRC | 22:09 | |
| nathany | got it | 22:09 |
| paulproteus | Control it all! | 22:20 |
| nkinkade | It would be easy enough to add those files, but there are passwords in them, so it was just easier to leave them alone, I figured. | 22:21 |
| *** Mihai`` has quit IRC | 22:27 | |
| *** paulproteus has quit IRC | 22:30 | |
| *** paulproteus has joined #cc | 22:31 | |
| nkinkade | paulproteus: Welcome back. | 22:31 |
| nkinkade | paulproteus: Sometimes when I press Enter to load up the diffs in kdiff3 it will return immediate and go to the next file. Do I take it that this means that the only diffs were whitespace and kdiff3 just resolved them for me automatically? | 22:33 |
| paulproteus | Thanks. | 22:33 |
| *** User819 has joined #cc | 22:35 | |
| User819 | hi | 22:35 |
| paulproteus | Yes. | 22:35 |
| User819 | i really need fake credit card holder | 22:35 |
| User819 | do u have? | 22:36 |
| nkinkade | User819: What you really need is to read the topic of this channel. | 22:36 |
| User819 | ok sorry | 22:36 |
| User819 | byee | 22:36 |
| nathany | User819: you can email tips@fbi.gov | 22:36 |
| nathany | i'm sure they'll be happy to help | 22:36 |
| User819 | just fake | 22:36 |
| User819 | ahahah | 22:37 |
| *** User819 has quit IRC | 22:37 | |
| paulproteus | nkinkade++ | 22:42 |
| nkinkade | There is apparently no end to these conflicts. I would swear that I have already resolved 30+. | 22:44 |
| nkinkade | paulproteus: At some point did you do some operation on the Drupal repository in which you renamed a bunch of files to *.orig? | 22:46 |
| nkinkade | Or was that me? | 22:46 |
| nkinkade | Nevermind, it's just in my local branch. | 22:47 |
| *** stevel_ has joined #cc | 22:58 | |
| nkinkade | Nevermind the nevermind, because it looks like it was git-mergetool that created all those .orig files. | 23:02 |
| *** stevel has quit IRC | 23:13 | |
| *** isforins1cts has quit IRC | 23:19 | |
| *** isforinsects has joined #cc | 23:20 | |
| *** asasd has joined #cc | 23:29 | |
| *** asasd has left #cc | 23:30 | |
| *** mlinksva has quit IRC | 23:46 | |
| *** stevel_ is now known as stevel | 23:53 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!