| paulproteus | Bovinity, sudo defaults write com.apple.systempreferences TMShowUnsupportedNetworkVolumes 1 | 00:31 |
|---|---|---|
| *** stevel has quit IRC | 00:38 | |
| *** Bovinity has quit IRC | 00:48 | |
| *** mindlike has joined #cc | 00:56 | |
| mindlike | can someone answer a question about mixing cc content with mixed cc / non-cc dvd content | 00:57 |
| mindlike | we're making | 00:57 |
| *** pandadave has joined #cc | 01:22 | |
| nkinkade | mindlike: I might be able to help point you in the right direction. | 01:26 |
| mindlike | say we do a dvd which we charge money for.. but have a few chapters we do as creative commons | 01:27 |
| mindlike | can we use other creative commons works in these chapters that require non-profit inclusion? | 01:28 |
| nkinkade | mindlike: I'd say it depends on what which license the CC content is under. | 01:28 |
| nkinkade | Clearly content under an NC license wouldn't work if you're selling the DVD. | 01:29 |
| mindlike | yes but since we're releasing those works for free elsewhere | 01:30 |
| mindlike | isn't that a workaround? | 01:30 |
| mindlike | just trying to see if we should use cc for these free chapters or not | 01:30 |
| nkinkade | mindlike: I'm not a lawyer and this is just my own view on it, but I would imagine that just because you are giving a few chapters away from free elsewhere wouldn't allow you to include NC works in those same chapters in some complete product that you are selling. | 01:31 |
| nkinkade | I think using a CC license for the free chapters makes total sense, but I'm just not sure you use include other NC works in those free chapters and still sell the whole thing. | 01:32 |
| mindlike | yeah thats more or less what I thought | 01:32 |
| nkinkade | However, you could possibly use BY, BY-SA or BY-ND works in those chapters. | 01:32 |
| mindlike | what if we only include the works on the parts we have online.. | 01:32 |
| nkinkade | Depending on how you're using them. | 01:32 |
| mindlike | almost like two flavors of same chapter | 01:32 |
| mindlike | dvd non-nc content version, and online +nc version which we're not selling | 01:33 |
| mindlike | but segmenting in a ppv stream | 01:33 |
| mindlike | but making those chapters public | 01:33 |
| mindlike | i'm not a lawyer either but you think that might work? | 01:33 |
| nkinkade | Again, I can't say with legal certainty, but I would imagine that as long as you're not selling the NC works, then you are okay, but the NC issue is fairly complicated. | 01:33 |
| nkinkade | Your plan above sounds reasonable to me "dvd non-nc content version, and online +nc version which we're not selling" | 01:34 |
| mindlike | for instance one chapter we have has s&m stuff.. so nin's content which is nc | 01:34 |
| mindlike | we wanted to use and help promot through youtube n such | 01:34 |
| mindlike | so I figured if the trailer was released on CC :) we could mix over whatever cc content we wanted as long as its not on the dvd release | 01:34 |
| nkinkade | mindlike: Again, that sounds reasonable to me. | 01:35 |
| nkinkade | CC Norway has put up a tool that might help steer you in the right direction: | 01:36 |
| nkinkade | http://www.creativecommons.no/ncguide/ | 01:36 |
| mindlike | thanks will read now | 01:36 |
| nkinkade | Keep in mind that it's not a legally binding tool, but just a guide. | 01:36 |
| nkinkade | CC is presently undertaking a study of how to better define what NC really means in the context of the licenses. | 01:37 |
| nkinkade | It will probably be some months before that is done. | 01:37 |
| mindlike | or maybe how it could be used in creative situations | 01:37 |
| nkinkade | My best advice is to be sensible about your usage of NC works, and if something doesn't *seem* right, then I'd either look for non-NC works or else try to contact the copyright holder. | 01:37 |
| mindlike | would be a nice way to teach younger ways how to use cc and profit at same time | 01:37 |
| nkinkade | Of course, you could always consult with a lawyer. | 01:38 |
| mindlike | we're doing that too | 01:38 |
| mindlike | but more to clean our own work of copyrighted edits | 01:38 |
| nkinkade | mindlike: It's a good point, and I think that the NIN example highlights how it is possible to use CC and still make money. | 01:39 |
| mindlike | well it says you can't use for advertising either | 01:41 |
| mindlike | http://www.creativecommons.no/ncguide/resolution.php?fr=B1&he=NN | 01:41 |
| mindlike | according to norway guide | 01:41 |
| nkinkade | The Norway guide is based off an old document we had called NC Draft Guidelines, but now that this study is underway, that was pulled to avoid confusion. | 01:42 |
| mindlike | well maybe I can't use on trailer but could use on alternative content we have online in non-ppv segment | 01:42 |
| nkinkade | But I think the basic idea still holds. | 01:42 |
| nkinkade | I would suggest that if the CC Norway tool indicates your use might be commercial, and you're worried about a lawsuit, that you should seek an alternative. | 01:43 |
| mindlike | was more just curious if we could creatively use cc | 01:43 |
| mindlike | we'll probably use it whether we can get cc content in or not | 01:43 |
| mindlike | i think its a cool tool for educational/creative purposes | 01:43 |
| nkinkade | There's reasons for using using ND and NC licenses, but what you are running up against is one of the reasons why many people generally promote more open licenses like the BY or BY-SA. | 01:43 |
| mindlike | not sure about business tho | 01:44 |
| nkinkade | The NC and ND terms really restrict the reuse of a work, as you are finding. | 01:44 |
| nkinkade | mindlike: There's lots of CC licensed music out there other than NIN. | 01:45 |
| nkinkade | Have you tried poking around at http://magnatune.com or http://jamendo.com or http://ccmixter.org? | 01:46 |
| mindlike | yeah just wanted to see if you could use pop culture stuff.. but seems like they have that cordoned off mostly for profit | 01:46 |
| mindlike | yeah checked em all out | 01:46 |
| mindlike | lots of obscure artists | 01:46 |
| mindlike | i just helped build the media platform thats behind lp33.tv | 01:46 |
| mindlike | but they're not cc (yet) | 01:46 |
| nkinkade | Yeah, but you're sure to find some music of that genre. | 01:46 |
| mindlike | oh yeah there's no scarcity of stuff to use or even create ourselves | 01:47 |
| nkinkade | :-) | 01:47 |
| mindlike | but we wanted to hook in some big names that chose to use cc | 01:47 |
| mindlike | if possible | 01:47 |
| nkinkade | That makes sense. | 01:47 |
| mindlike | and it seems like there's a slight possibility if we experiment with our own content release strategy | 01:47 |
| nkinkade | mindlike: One last idea for the audio stuff: http://wiki.creativecommons.org/Content_Directories | 01:50 |
| nkinkade | Maybe you've already seen that. | 01:50 |
| nkinkade | But there's an audio section where you might be able to find more CC-licensed music. | 01:51 |
| mindlike | oh thanks | 01:51 |
| mindlike | we're good though.. got plenty for this one | 01:51 |
| *** nkinkade has quit IRC | 01:53 | |
| mindlike | wow this is stocked tho thanks | 01:54 |
| mindlike | bookmarking | 01:54 |
| mindlike | later dudes | 01:55 |
| *** mindlike has quit IRC | 01:55 | |
| *** is4 has joined #cc | 02:01 | |
| *** parkerhiggins_ has joined #cc | 02:21 | |
| *** parkerhiggins has quit IRC | 02:30 | |
| *** [mharrison] has joined #cc | 02:54 | |
| *** pandadave_ has joined #cc | 04:44 | |
| *** pandadave_ has quit IRC | 05:07 | |
| *** pandadave_ has joined #cc | 05:07 | |
| *** pandadave has quit IRC | 05:12 | |
| *** pandadave has joined #cc | 05:38 | |
| *** pandadave_ has quit IRC | 05:56 | |
| *** pandadave_ has joined #cc | 05:56 | |
| *** adjohn has quit IRC | 06:00 | |
| *** pandadave has quit IRC | 06:03 | |
| *** adjohn has joined #cc | 06:09 | |
| *** pandadave has joined #cc | 06:39 | |
| *** is4 has quit IRC | 06:43 | |
| *** afdadsfadsf has joined #cc | 06:48 | |
| *** afdadsfadsf has left #cc | 06:49 | |
| *** pandadave has quit IRC | 06:52 | |
| *** pandadave has joined #cc | 06:52 | |
| *** pandadave_ has quit IRC | 06:59 | |
| *** qknight has quit IRC | 07:11 | |
| *** jgay has quit IRC | 07:17 | |
| *** parkerhiggins has joined #cc | 08:39 | |
| *** parkerhiggins_ has quit IRC | 08:39 | |
| *** parkerhiggins_ has joined #cc | 08:41 | |
| *** parkerhiggins has quit IRC | 08:41 | |
| *** parkerhiggins has joined #cc | 08:42 | |
| *** parkerhiggins_ has quit IRC | 08:42 | |
| *** adjohn has quit IRC | 08:44 | |
| *** parkerhiggins has quit IRC | 08:49 | |
| *** parkerhiggins has joined #cc | 08:49 | |
| *** parkerhiggins_ has joined #cc | 08:50 | |
| *** parkerhiggins has quit IRC | 08:50 | |
| *** parkerhiggins_ has quit IRC | 08:51 | |
| *** parkerhiggins has joined #cc | 08:53 | |
| *** parkerhiggins_ has joined #cc | 08:55 | |
| *** parkerhiggins has quit IRC | 08:55 | |
| *** parkerhiggins_ has quit IRC | 08:56 | |
| *** parkerhiggins has joined #cc | 08:56 | |
| *** parkerhiggins_ has joined #cc | 08:58 | |
| *** parkerhiggins has quit IRC | 08:58 | |
| *** parkerhiggins has joined #cc | 08:59 | |
| *** parkerhiggins_ has quit IRC | 08:59 | |
| *** parkerhiggins has quit IRC | 09:00 | |
| *** parkerhiggins has joined #cc | 09:03 | |
| *** parkerhiggins has quit IRC | 09:10 | |
| *** parkerhiggins has joined #cc | 09:51 | |
| *** parkerhiggins has quit IRC | 09:55 | |
| *** parkerhiggins has joined #cc | 10:02 | |
| *** adjohn has joined #cc | 10:04 | |
| *** tvol has joined #CC | 12:56 | |
| *** joe_ has joined #cc | 13:22 | |
| joe_ | hellou | 13:22 |
| joe_ | ! | 13:22 |
| joe_ | ive got a quick question | 13:22 |
| joe_ | anyone there? | 13:22 |
| joe_ | :D | 13:22 |
| joe_ | is there a place to upload pictures ?! | 13:23 |
| joe_ | where i can be (at least a little) sure theyre protected ? (not like imageshack or stuff like that) ?? | 13:24 |
| joe_ | wikipedia ? | 13:24 |
| parkerhiggins | protected from what, joe_ ? | 13:24 |
| joe_ | from being kidnapped by ad or news agencies or .... | 13:24 |
| joe_ | ^^ | 13:24 |
| parkerhiggins | oh. i don't know which sites are more or less susceptible to that. | 13:25 |
| joe_ | ok | 13:25 |
| joe_ | wikipedia should work ?! | 13:25 |
| parkerhiggins | well, i don't understand how that would be an unlikely place for ad or news agency kidnapping, but if you have some reason to think that, you may be correct. | 13:26 |
| joe_ | :D | 13:27 |
| joe_ | hehe | 13:27 |
| joe_ | im sorry | 13:27 |
| joe_ | hmm | 13:32 |
| joe_ | ill tell you what i wanna do | 13:32 |
| joe_ | i went photographing a lot of mushrooms yesterday and want to put them up in wikipedias commons | 13:32 |
| joe_ | http://commons.wikimedia.org/wiki/Category:Fungi?uselang=en | 13:32 |
| *** Roderick__ has quit IRC | 14:16 | |
| *** joe_ has left #cc | 14:28 | |
| *** nkinkade has joined #cc | 14:31 | |
| *** stevel has joined #cc | 15:35 | |
| *** nkinkade has quit IRC | 16:03 | |
| *** nkinkade has joined #cc | 16:06 | |
| *** is4 has joined #cc | 16:22 | |
| *** is4loan_ has joined #cc | 16:22 | |
| *** qknight has joined #cc | 16:47 | |
| *** [mharrison] has quit IRC | 16:47 | |
| *** Bovinity has joined #cc | 17:01 | |
| *** nkinkade has quit IRC | 17:18 | |
| *** nkinkade has joined #cc | 17:28 | |
| *** tvol has quit IRC | 17:32 | |
| *** tvol has joined #CC | 18:01 | |
| paulproteus | Morning, all. | 18:07 |
| nkinkade | Howdy, paulproteus. | 18:08 |
| *** jgay has joined #cc | 18:11 | |
| *** tvol has quit IRC | 18:13 | |
| nkinkade | paulproteus: Are you using Intrepid Ibex on your laptop? | 18:38 |
| paulproteus | nkinkade, No, still Hardy I think. | 18:39 |
| nkinkade | http://www.bahamasferries.com/ | 18:39 |
| nkinkade | That site irreparably crashes X, so badly I had to reboot. And it's done it twice. | 18:39 |
| nkinkade | Just curious if it would do the same for you. Probably Flash related. | 18:40 |
| paulproteus | I don't think I have brand-name Flash installed anywhere anymore. | 18:43 |
| paulproteus | I prefer to use cheap third-party knockoffs. | 18:43 |
| nkinkade | I might go that direction, but I'm saddened by the fact that a web page could crash my whole machine. | 18:48 |
| paulproteus | nkinkade, I suppose it's a bug in your X card driver. | 18:49 |
| paulproteus | Sounds reportable to me! | 18:49 |
| *** trontonic has joined #cc | 19:39 | |
| trontonic | If I use cc music for a showreel, is that a "commercial purpose"? | 19:40 |
| nkinkade | trontonic: What do you mean by a "showreel"? | 19:43 |
| trontonic | trontonic: 3d graphics, put together in a short video, with the intention of perhaps getting a job | 19:44 |
| trontonic | (within the field of 3d-graphics) | 19:44 |
| nkinkade | trontonic: There are no easy answers to the NC question. | 19:44 |
| nkinkade | That's not much of a reply, I know, but it's about as good as anyone can do at the moment. | 19:44 |
| nkinkade | I do have two suggestions, though. | 19:44 |
| nkinkade | First this is worth noting: http://wiki.creativecommons.org/NC | 19:45 |
| trontonic | nkinkade: okay, thanks. So, should I use my own music (which is worse), or just take a chance on it not being commercial, since I will not make money of it in a direct fashion? | 19:45 |
| nkinkade | Then, our affiliates at CC Norway have a tool that could be useful to you, though it's by no means the final word: | 19:45 |
| nkinkade | http://www.creativecommons.no/ncguide/ | 19:46 |
| nkinkade | trontonic: If it's just one piece of music, then you might consider trying to contact the copyright holder .. if you are unsure. | 19:46 |
| trontonic | nkinkade: great, thanks. I do plan on putting it on my webpage, though, so I'm not sure how it is with laws and everything. The server is in Norway, but I'm not a lawyer :) | 19:47 |
| trontonic | nkinkade: that's a good suggestion, perhaps I'll even ask someone for some regular copyrighted music. Come to think of it, I could ask one of my musician-friends instead. It would be nice to be able to use CC-music without worries, though. | 19:48 |
| trontonic | The licensing-stuff really stifles innovasion, even though it's only in a small way for my part. | 19:48 |
| nkinkade | trontonic: Have you been around to some of the music sites that focus on CC music? | 19:48 |
| nkinkade | http://magnatune.com, http://jamendo.com, http://ccmixter.org, etc. | 19:49 |
| trontonic | nkinkade: Yes, I've registered at freesound and done a lot of searching. The quality is okay in some places, but the whole point of using CC-music would be to not feel insecure at the use, IMO. | 19:49 |
| nkinkade | trontonic: As far as using CC music without worries, you can do it, just don't use music with an NC-type license. :-) | 19:49 |
| trontonic | nkinkade: If you exclude the NC-type license there's not much music left, unfortunately :/ | 19:50 |
| trontonic | nkinkade: At least music of a good enough quality to be used for a reel | 19:50 |
| trontonic | nkinkade: I've really searched, for days | 19:50 |
| paulproteus | That use doesn't strike me as really commercial. | 19:51 |
| paulproteus | You're not restricting others from using the work, nor using it in advertising. | 19:51 |
| paulproteus | So the use you describe seems okay. I'm not a lawyer, and even worse, I'll be offline for a little while of the next few minutes. | 19:51 |
| paulproteus | nkinkade, I was wrong; I have name-brand Flash here. | 19:51 |
| paulproteus | That website loads okay. | 19:51 |
| paulproteus | But that's with Hardy. | 19:51 |
| paulproteus | "You have version 9,0,124,0 installed" says http://www.adobe.com/products/flash/about/ | 19:51 |
| trontonic | paulproteus: In a way, it is advertising for me. | 19:51 |
| paulproteus | trontonic, Yes, but not for a company. | 19:51 |
| paulproteus | I think that's an important difference. | 19:52 |
| trontonic | Perhaps it's easier if I just use copyrighted music with the permission of the author or my own music. The CC-license is too unclear for me. | 19:52 |
| paulproteus | A subtle one. | 19:52 |
| paulproteus | But anyway, /me vanishes! | 19:52 |
| trontonic | paulproteus: I have a company | 19:52 |
| trontonic | paulproteus: cu | 19:52 |
| nkinkade | paulproteus: Then what you say makes even more sense, that it's probably something at a lower level than Flash or Firefox, perhaps an issue with the graphics driver. | 19:53 |
| nkinkade | I did just switch to using the framebuffer as I went to Intrepid. | 19:53 |
| trontonic | I think CC is useless. Thanks for answering my questions, I'm off. | 19:53 |
| *** trontonic has left #cc | 19:55 | |
| *** [mharrison] has joined #cc | 20:01 | |
| nkinkade | paulproteus: It turns out that git-svn'ing the whole CiviCRM repository is no quick job. | 20:07 |
| nkinkade | It got interrupted last night and once this morning, until I finally got wise and launched it in a screen session, but it's still going right now. | 20:07 |
| *** qknight has quit IRC | 20:22 | |
| is4 | paulproteus, >> http://www.flickr.com/photos/creativecommons/2986783159/ | 20:29 |
| is4 | ha! | 20:29 |
| paulproteus | is4, (-: | 20:33 |
| paulproteus | trontonic's story is sad. | 20:34 |
| paulproteus | nkinkade, Yeah, the Drupal CVS import finished after "only" a few hours. | 20:34 |
| *** parkerhiggins has left #cc | 20:35 | |
| *** luisv has joined #cc | 20:46 | |
| *** [mharrison] has quit IRC | 20:53 | |
| *** adjohn has quit IRC | 20:54 | |
| paulproteus | nkinkade, I see you made a Drupal git repository. I'm going to make some branches in it sync with Drupal CVS. That sound okay? | 20:58 |
| nkinkade | paulproteus: Yeah, I made that yesterday. | 21:00 |
| nkinkade | But it's just a snapshot of our current drupal install. | 21:00 |
| paulproteus | Er, it has commits? | 21:01 |
| paulproteus | I noticed zero commits. | 21:01 |
| paulproteus | So I just pushed the CVS thing to it. | 21:01 |
| paulproteus | c.f. http://code.creativecommons.org/viewgit?p=drupal.git;a=summary | 21:02 |
| paulproteus | I wonder what http://code.creativecommons.org/viewgit?p=drupal.git;a=commitdiff;h=9c114af8252a95d019d2308a0668e04396a47975 is about. | 21:02 |
| paulproteus | What version of Drupal is ours based on? | 21:03 |
| paulproteus | Should I whip out my find-nearest-neighbor script? | 21:03 |
| nkinkade | paulproteus: 5.7 | 21:03 |
| nkinkade | The only commit in that repository should be the initial commit when I added all the files. | 21:03 |
| paulproteus | nkinkade, That repo had zero commits when I pushed to it a moment ago. | 21:04 |
| paulproteus | http://code.creativecommons.org/viewgit?p=drupal.git;a=commit;h=650755addba5f8b7e8ba9720f0030497e1b50413 is 5.7, apparently. | 21:04 |
| nkinkade | Well, maybe it doesn't register the first commit of the files. | 21:05 |
| nkinkade | I basically did "git init" | 21:05 |
| nkinkade | git add . | 21:05 |
| nkinkade | git commit | 21:05 |
| nkinkade | git push | 21:06 |
| paulproteus | Where did you push to? | 21:06 |
| paulproteus | 'Cause you sure didn't seem to push there. | 21:06 |
| paulproteus | Did you "git remote add"? | 21:06 |
| nkinkade | Yes, I did git remote add. | 21:08 |
| paulproteus | Well, I don't know what you did, but there was no evidence that you had pushed. | 21:10 |
| paulproteus | Maybe you just didn't push enter when you thought you did push? | 21:10 |
| paulproteus | I'm really in the dark about what you did. | 21:10 |
| nkinkade | paulproteus: That repository was empty? | 21:11 |
| paulproteus | Yes. | 21:11 |
| nkinkade | I think I had a network issue during the push, so maybe it never got there. | 21:11 |
| paulproteus | Ah-hah. | 21:11 |
| nkinkade | I recall having had to restart the push. | 21:11 |
| nkinkade | But everything was lining up nicely. | 21:12 |
| paulproteus | Well, anyway, now the Drupal CVS thing is there instead. | 21:12 |
| nkinkade | Just as well. | 21:12 |
| paulproteus | I could nuke it and we could put your stuff there, but best is to merge them anyway. | 21:12 |
| nkinkade | So how do we get our current one in there so that we're able to see any changes? | 21:12 |
| paulproteus | (a) Push the CC work to a branch called cc. | 21:12 |
| paulproteus | (b) use "git merge -s ours" ("s" for "strategy") to merge the cc branch and the commit that creates Drupal 5.7. | 21:13 |
| nkinkade | paulproteus: I don't know what that means. | 21:16 |
| nkinkade | Or better phrased, why a merge would be necessary. | 21:16 |
| paulproteus | Well, the merge would be useful so that you can later try to "git merge" the Drupal 5.8 or 5.9. | 21:16 |
| paulproteus | And then git would know to only try to apply the deltas that aren't already part of 5.7. | 21:17 |
| nkinkade | Ah. | 21:17 |
| paulproteus | Is that enough to get you going? | 21:18 |
| nkinkade | paulproteus: I might be, and I'll try, but I suspect it's not enough. :-) | 21:19 |
| paulproteus | Okay. Keep me posted. | 21:19 |
| nkinkade | paulproteus: How do I get just our version into git? | 21:26 |
| paulproteus | You already have it committed in a local repository, yes? | 21:26 |
| nkinkade | Do I just dump it on top of a checkout of 5.7. | 21:26 |
| paulproteus | So just push that branch to a branch named "cc" on the remote. | 21:26 |
| paulproteus | Ta-da, done. | 21:26 |
| *** is4 has quit IRC | 21:26 | |
| paulproteus | You can ignore all the other junk floating about in other branches if you like. | 21:27 |
| nkinkade | So just take our source, git-init it, add a remote and the push it to the repository under a new branch name? | 21:27 |
| paulproteus | Sounds good to me. | 21:27 |
| nkinkade | I doesn't involve at all a clone of the current one. | 21:27 |
| nkinkade | ? | 21:27 |
| paulproteus | You don't have to. | 21:28 |
| paulproteus | You can. | 21:28 |
| paulproteus | Makes no difference. | 21:28 |
| paulproteus | Whatevs. | 21:28 |
| paulproteus | That's for step 1. | 21:28 |
| paulproteus | For step 2, the merge step, sure, you'll want both the cvs-based and the not-cvs-based one. | 21:28 |
| paulproteus | Does this make sense? | 21:28 |
| paulproteus | Wow, I have only one hand: http://www.flickr.com/photos/creativecommons/2986763539/in/set-72157608516786167/ | 21:34 |
| nkinkade | paulproteus: Why does gitweb say that a cc head was created 24 hours ago? | 21:36 |
| paulproteus | Buh. | 21:36 |
| paulproteus | Oh, gitweb only looks at time stored in the git commit. | 21:36 |
| nkinkade | I created a local branch called cc, then pushed it to "origin". | 21:36 |
| paulproteus | Not the time the commit was pushed. | 21:36 |
| paulproteus | So that commit was created 24h ago, supposedly. | 21:37 |
| nkinkade | I think it worked. | 21:37 |
| paulproteus | Branches are just labels on commits, and there is no metadata for branches in git. | 21:37 |
| paulproteus | So git can't know when branches were created, only the most recent commit *on* said branch. | 21:37 |
| nkinkade | So now the merge? | 21:39 |
| paulproteus | Sounds good to me. | 21:39 |
| paulproteus | You may want to hand-review the diffs to avoid a spuriously large patch. | 21:39 |
| paulproteus | The thing to do is to find the revision you want to tell git you branched off from (which I found earlier as the one labeled "Drupal 5.7"). | 21:39 |
| paulproteus | Do "git checkout $that_sha1_thing" | 21:39 |
| paulproteus | Er, ignore the "do" above. | 21:40 |
| paulproteus | Stay on the cc branch, and do: | 21:40 |
| paulproteus | Then git merge --no-commit -s ours $that_sha1_thing | 21:40 |
| nkinkade | What is "ours" and I forgot how to find the SHA1 | 21:40 |
| paulproteus | By SHA1 I mean "commit ID". | 21:41 |
| paulproteus | BTW if you want me to do this I'm okay with that. | 21:41 |
| paulproteus | I just want to be sure to offer you the chance to learn rather than just have me do it. | 21:41 |
| nkinkade | Right, but the commit id of what? | 21:43 |
| nkinkade | 5.7, or of the branch cc? | 21:43 |
| nkinkade | And I'd like to learn, but have this sense that unless I'm using git all the time that I won't really learn in any meaningful way. | 21:43 |
| paulproteus | 5.7. | 21:44 |
| nkinkade | I'm not really a programmer and while I do some coding things, I don't do enough software development to really use git more than just occassionally. | 21:44 |
| paulproteus | This would be way easier to explain in person. | 21:44 |
| paulproteus | I'll just hurriedly do this, one sec. | 21:44 |
| nkinkade | We've gone over a lot of this on a whiteboard before and it was helpful, and then I didn't use any of it and within a few weeks most of it had gone away. | 21:46 |
| nkinkade | The fact is that until I see a need to use git on a regular basis, I'm not likely to put any effort into learning it thoroughly. | 21:47 |
| paulproteus | Right-o. | 21:50 |
| paulproteus | nkinkade, This commit includes hilarious amount of detail on our contributors. | 21:56 |
| paulproteus | In the CiviCRM Log. | 21:56 |
| nkinkade | paulproteus: dlobo? | 21:56 |
| paulproteus | !?! | 21:57 |
| paulproteus | What can that possibly mean? | 21:58 |
| nkinkade | He | 21:58 |
| nkinkade | 's an active commiter, I think. | 21:59 |
| paulproteus | Um, okay. | 21:59 |
| nkinkade | Oh wait. Nevermind, he's with CiviCRM. | 21:59 |
| paulproteus | - [payer_id] => 9VTSNM93FC5KA | 21:59 |
| paulproteus | - [receiver_id] => WV32EUJVTFL52 | 21:59 |
| paulproteus | - [item_number] => | 21:59 |
| paulproteus | - [payment_status] => Completed | 21:59 |
| paulproteus | - [payment_fee] => 0.33 | 21:59 |
| nkinkade | Bah. | 21:59 |
| paulproteus | That's the sort of stuff I mean. | 21:59 |
| nkinkade | Oh, I see what you mean. | 21:59 |
| nkinkade | We'll that's disappointing. I scrubbed the CiviCRM.log, but there must be another in the drupal area that I missed. | 22:00 |
| paulproteus | Guess so. | 22:00 |
| paulproteus | You can git grep receiver_id. | 22:00 |
| paulproteus | Want me to remove that file and recreate that original commit? | 22:01 |
| paulproteus | Well, I'll do that in another branch right this second. | 22:02 |
| nkinkade | paulproteus: Yeah, that would be good. What file is it? | 22:04 |
| paulproteus | Do we need anything in sites/default/files/civicrm/upload at all? | 22:04 |
| paulproteus | Looks all bad to me. | 22:05 |
| paulproteus | I'll remove it and add it .gitignore if that's okay with you. | 22:05 |
| nkinkade | paulproteus: Wait. | 22:06 |
| paulproteus | I'm waiting. | 22:06 |
| nkinkade | Did you just push up everything in /var/www/support.creativecommons.org/www? | 22:06 |
| paulproteus | I have no idea what's in /var/www/support/anything. | 22:06 |
| paulproteus | I'm only looking at what's in the drupal repository on code-dot. | 22:06 |
| nkinkade | Oh, then I must have just done that by accident. | 22:07 |
| paulproteus | I think that's by and large sensible, once we remove stuff we shouldn't be posting. | 22:07 |
| nkinkade | But to answer your question, stuff in sites/default/files/civicrm/upload might be worth keeping. I'm not 100% sure. | 22:09 |
| paulproteus | I'm only referring to what's good to publish in git when I say "keep." | 22:10 |
| paulproteus | My suggestion is to .gitignore the directory so that we don't commit stuff in there. | 22:10 |
| nkinkade | paulproteus: I just looked and it doesn't appear that anything in that dir. is important for keeping. | 22:13 |
| nkinkade | In the repository, that is. | 22:13 |
| paulproteus | Cool. | 22:14 |
| paulproteus | I'm redoing your initial commit right now without it, then. | 22:15 |
| nkinkade | Sorry. Thanks. | 22:15 |
| paulproteus | No prob. | 22:17 |
| *** [mharrison] has joined #cc | 22:32 | |
| paulproteus | nkinkade, Ooh, fun times. | 22:37 |
| paulproteus | I created the merged_cc branch. | 22:37 |
| paulproteus | And pushed it to the remote. | 22:37 |
| paulproteus | On a fresh clone, you could do (if you wanted): | 22:38 |
| paulproteus | git branch --track merged_cc origin/merged_cc | 22:38 |
| paulproteus | git branch 5.8 83eb658967c49b542144907682fe47306676084a # I found the commit ID for Drupal 5.8 | 22:38 |
| paulproteus | git checkout merged_cc | 22:38 |
| nkinkade | paulproteus: Let me take a look. Are theremany differences. | 22:38 |
| paulproteus | git merge 5.8 | 22:38 |
| nkinkade | ? | 22:38 |
| paulproteus | No, hardly any. | 22:38 |
| paulproteus | With the above command set you can bring us forward to 5.8, yay. | 22:39 |
| nkinkade | And that's to be expected. Thank goodness not many are showing up. :-) | 22:39 |
| paulproteus | I did hack out a bunch of spurious changes related to CVS keyword expansion. | 22:40 |
| paulproteus | That wasn't too hard, and that should be over now. | 22:40 |
| paulproteus | We should remove the "cc" branch if you're ready. | 22:40 |
| nkinkade | Until the CiviCRM clone finishes. | 22:41 |
| nkinkade | Sure, blast the cc branch. | 22:41 |
| paulproteus | Done. | 22:41 |
| nkinkade | paulproteus: I'm starting to feel that git-svn on the CiviCRM repository is in an endless loop. | 23:02 |
| paulproteus | That's silly, but possible with some old-ish versions of git-svn. | 23:02 |
| nkinkade | paulproteus: I'm not serious. It's just taking a really really long time. | 23:05 |
| paulproteus | Oh, okay. | 23:05 |
| paulproteus | It's quite amazing that it's still going. | 23:05 |
| paulproteus | nkinkade, When I read "Macedonia" I can't help but think of Macademia nuts. | 23:06 |
| nkinkade | It ran for a hour or so yesterday and it's been going for a few hours today. | 23:07 |
| nkinkade | Mmm. Macadamia nuts. | 23:07 |
| nkinkade | paulproteus: Do you really mean the Former Yugolav Republic of Macadamia nuts? | 23:09 |
| paulproteus | You'll have to speak to my affiliates in Macademia. | 23:09 |
| *** stevel has quit IRC | 23:57 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!