| nkinkade | Bovinity: Before I get to business. Where did Bovinity come from? | 00:28 |
|---|---|---|
| Bovinity | nkinkade: it stems from my old irc handle, bse. someone started calling me bovinity, and it kinda stuck. | 00:29 |
| Bovinity | it's more or less as random as asheesh's. | 00:29 |
| nkinkade | How does one get Bovinity from bse? | 00:29 |
| nkinkade | But what was bse? | 00:30 |
| Bovinity | nkinkade: Bovine spongiform encephalopathy | 00:30 |
| nkinkade | Ah. | 00:30 |
| Bovinity | mad cow disease | 00:30 |
| nkinkade | Now that that is cleared up and I can sleep well, do you object to me taking down zupport long enough to get it running from a git checkout? | 00:31 |
| Bovinity | nkinkade: nope, go ahead | 00:32 |
| nkinkade | Bovinity: Do you have any changes in zupport that haven't been implemented in support yet? | 00:33 |
| nkinkade | I'm wondering if we should just start clean with a copy of production, or if there are testing features that should stay put. | 00:33 |
| Bovinity | nkinkade: nope, afaik zupport and support are the same - DB aside | 00:35 |
| nkinkade | Perfect. I'll just start fresh so that zupport will be identical to production as it looks right now. | 00:36 |
| *** parkerhiggins has joined #cc | 00:43 | |
| Bovinity | is it just me or is http://creativecommons.org/asharedculture taking a damn long time to load | 00:49 |
| Bovinity | oh, there it is | 00:50 |
| nkinkade | Bovinity: paulproteus not around today? | 00:51 |
| Bovinity | nkinkade: apparently not, i think he's travelling.. there's an email | 00:51 |
| nkinkade | I'm rather bumbling along with git and submodules, but I guess it's good because I'm reading a lot and learning. | 00:51 |
| Bovinity | he would be proud | 00:51 |
| greg-g | only thing I learned about git today was how the rebase option should be destroyed | 00:54 |
| Bovinity | gah... blip.tv.fail | 00:54 |
| greg-g | teamspeace is failing too | 00:56 |
| greg-g | can't save an edit | 00:56 |
| greg-g | Fx wants to save the index.php file | 00:56 |
| nkinkade | greg-g: A technical problem with teamspace? | 00:56 |
| * greg-g tries with epiphany | 00:57 | |
| greg-g | hmm, weird, epiphany did it | 00:59 |
| greg-g | nevermind completely, Fx now works too. I'm puzzled to why that happened | 01:00 |
| * greg-g waves as he leaves the coffee shop | 01:01 | |
| *** [mharrison] has joined #cc | 01:03 | |
| *** tvol has quit IRC | 01:36 | |
| *** is4 has quit IRC | 01:52 | |
| paulproteus | nkinkade, I'm around now. | 01:52 |
| paulproteus | greg-g, I don't mind rebase, but don't tell anyone (-; | 01:53 |
| paulproteus | nkinkade, Dude | 01:53 |
| paulproteus | nkinkade, git push $REMOTE_TO_PUSH_TO $NAME_OF_LOCAL_OBJECT:$REMOTE_BRANCH_NAME | 01:53 |
| paulproteus | You don't have to use the refs/heads/ syntax any longer. | 01:53 |
| nkinkade | paulproteus: Where are you? | 01:54 |
| paulproteus | Princeton, New Jersey. | 01:54 |
| nkinkade | Cool. | 01:54 |
| paulproteus | The REMOTE_TO_PUSH_TO is almost always origin, but consider for a moment that you might have other remote servers than just "origin". | 01:54 |
| nkinkade | Friends there? | 01:54 |
| paulproteus | Ya. | 01:55 |
| paulproteus | I'm on my way back to Brooklyn tomorrow, and then Wednesday I'm at home in Rochester. | 01:55 |
| paulproteus | The NAME_OF_LOCAL_OBJECT is e.g. the local branch name, like local_cc_funtime. | 01:55 |
| paulproteus | It would pretty much never be "origin." | 01:55 |
| nkinkade | paulproteus: I've got it mostly going on a9, but was having a problem with submodules. | 01:55 |
| paulproteus | Okay. | 01:55 |
| paulproteus | Can I help? | 01:56 |
| nkinkade | It would seem that there is some other submodule already existent in the drupal checkout | 01:56 |
| nkinkade | . | 01:56 |
| nkinkade | And I think it may be messing with the submodule I added. | 01:56 |
| nkinkade | On a9:/var/www/zupport.CC.org/www.gittted | 01:56 |
| nkinkade | Try git update. | 01:57 |
| nkinkade | It complains about the template dir. | 01:57 |
| nkinkade | I haven't looked much at it yet, was going to tomorrow, but I suspect it's another git checkout or submodule. | 01:57 |
| paulproteus | "git update"? | 01:57 |
| paulproteus | What a weird command. | 01:57 |
| * paulproteus wonders what it does | 01:57 | |
| nkinkade | git submodule update | 01:58 |
| nkinkade | sorrty | 01:58 |
| nkinkade | sortie? | 01:58 |
| paulproteus | No probtlem. | 01:58 |
| paulproteus | nkinkade@a9:/var/www/zupport.creativecommons.org/www.gitted$ git submodule init | 01:59 |
| paulproteus | No submodule mapping found in .gitmodules for path 'sites/default/themes/support2008' | 01:59 |
| paulproteus | I wonder what that's about. | 01:59 |
| paulproteus | git submodule update says the same. | 01:59 |
| nkinkade | paulproteus: I was wondering the same thing. | 02:00 |
| nkinkade | What I do know is that support2008 is it's own git repository. | 02:01 |
| nkinkade | Or at least themes (I think) | 02:01 |
| nkinkade | So I hit that wall, then decided to quite for the day, but figured it was related to some stray .git or .gitmodules. | 02:01 |
| nkinkade | And resolved to look into it tomorrow, and possibly to email you or hit you up on #cc. | 02:02 |
| nkinkade | :-) | 02:02 |
| paulproteus | But there is a .gitmodules. | 02:02 |
| paulproteus | And it doesn't mention support2008. | 02:02 |
| paulproteus | Why does it think about support2008, I wonder. | 02:02 |
| nkinkade | I asked myself that same question. | 02:03 |
| Bovinity | cc_support_theme.git branch 2008 | 02:03 |
| nkinkade | Maybe there's a .gitmodules in that dire? | 02:03 |
| Bovinity | if i recall | 02:03 |
| Bovinity | submodule that to your will | 02:03 |
| paulproteus | nkinkade@a9:/var/www/zupport.creativecommons.org/www.gitted$ find -name .gitmodules | 02:03 |
| paulproteus | ./.gitmodules | 02:03 |
| paulproteus | nkinkade@a9:/var/www/zupport.creativecommons.org/www.gitted$ find -name .git | 02:03 |
| paulproteus | ./.git | 02:03 |
| paulproteus | ./sites/default/modules/civicrm/.git | 02:03 |
| nkinkade | It would be easy to fiind out some of this stuff, but like I say, I resolved to check it tomorrow, but since you're here ... | 02:03 |
| paulproteus | I'll see if my fiddling can improve things. You can go about your business. | 02:04 |
| nkinkade | I have no business here. | 02:04 |
| nkinkade | And I say that to myself every day. | 02:04 |
| nkinkade | And I believe it might be true. | 02:04 |
| nkinkade | Bovinity: Good God. How did you slip in here. | 02:05 |
| Bovinity | with my eyes | 02:05 |
| paulproteus | Dastardly. | 02:05 |
| Bovinity | i also haven't left the office yet. | 02:05 |
| nkinkade | It was so surreptitiously that I didn't even notice that your previous comments were yours. | 02:05 |
| nkinkade | If it weren't for the color coding of usernames, I'd have thought you were paulproteus. | 02:06 |
| * paulproteus does his one clone | 02:08 | |
| * paulproteus whips out git bisect | 02:10 | |
| nkinkade | git-bisect! | 02:10 |
| nkinkade | How many git commands are there? | 02:10 |
| Bovinity | wc -l | ls -l /usr/bin/git* | 02:11 |
| paulproteus | Er, that may not be in the right direction. | 02:11 |
| paulproteus | Also /usr/libexec/git/ these days I think. | 02:11 |
| Bovinity | oh, oops, wrong way | 02:11 |
| Bovinity | thus i should go home | 02:11 |
| *** Bovinity has quit IRC | 02:15 | |
| *** Dalvion has joined #cc | 02:28 | |
| *** Dalvion has left #cc | 02:28 | |
| *** stevel has quit IRC | 03:02 | |
| *** mlinksva has quit IRC | 03:33 | |
| *** nkinkade has left #cc | 03:42 | |
| *** [mharrison] has quit IRC | 04:48 | |
| *** [mharrison] has joined #cc | 05:17 | |
| *** CriticalDozens has joined #cc | 05:18 | |
| *** adjohn has joined #cc | 05:23 | |
| *** adjohn has quit IRC | 05:27 | |
| *** adjohn has joined #cc | 05:27 | |
| *** is4 has joined #cc | 05:35 | |
| *** CriticalDozen has quit IRC | 05:36 | |
| *** [mharrison] has quit IRC | 07:45 | |
| *** [mharrison] has joined #cc | 07:45 | |
| *** balor has joined #cc | 08:24 | |
| *** [mharrison] has quit IRC | 09:40 | |
| *** Administrator has joined #cc | 10:08 | |
| *** sama has joined #cc | 10:30 | |
| *** balor has quit IRC | 10:32 | |
| *** sama has quit IRC | 10:49 | |
| *** Administrator has quit IRC | 10:57 | |
| *** balor has joined #cc | 11:16 | |
| *** sama has joined #cc | 11:24 | |
| *** balor has quit IRC | 11:54 | |
| *** applesauce has joined #cc | 12:07 | |
| *** remotec has quit IRC | 12:21 | |
| *** balor has joined #cc | 12:48 | |
| *** jgay has joined #cc | 13:42 | |
| *** mlinksva has joined #cc | 14:16 | |
| *** jgay has quit IRC | 15:10 | |
| *** jgay has joined #cc | 15:11 | |
| *** nkinkade has joined #cc | 15:24 | |
| *** stevel has joined #cc | 16:09 | |
| *** pandadave has joined #cc | 16:11 | |
| *** TRD has joined #cc | 16:14 | |
| *** nathany has joined #cc | 16:18 | |
| paulproteus | nkinkade, I look forward to your feedback on my git-related Drupal email. | 16:34 |
| nkinkade | paulproteus: I'll respond shortly. | 16:35 |
| mlinksva | nkinkade: i think a7 (teamspace, forum) has a problem | 16:35 |
| paulproteus | I mention it here mostly to indicate that response via IRC may make more sense now that we're both awake. | 16:35 |
| nkinkade | mlinksva: Let me see . | 16:36 |
| nkinkade | I haven't got a Nagios message yet, but it could be lagging by a few minutes. | 16:36 |
| mlinksva | nkinkade: well the websites don't respond :) | 16:40 |
| mlinksva | machine does ping, haven't tried logging in | 16:40 |
| nkinkade | mlinksva: I see that. I can't even SSH to it. | 16:40 |
| nkinkade | I'm already logged into my.serverbeach.com thinking about pressing the "Rapid Reboot" button. | 16:41 |
| paulproteus | I see you did. | 16:42 |
| nkinkade | Yes, I just did. | 16:42 |
| nkinkade | But this bring up a fault the Nagios config. We're not getting notifications from Nagios on a7 because it's unresponsive. a8 would normally take over in this case, but it won't unless it thinks the host is down, which it determines with ping. | 16:43 |
| paulproteus | Don't use ping, use a more rigorous "is host up?" check then. | 16:44 |
| paulproteus | Obviously that's a problem. | 16:44 |
| paulproteus | You could possibly have both act as master, and have them write messages with the a Message ID header that is a hash of the complaint they want to deliver, along with the date. | 16:45 |
| paulproteus | That way, message-id based duplicate elimination in your email client would merge them into the same message. | 16:45 |
| paulproteus | But that doesn't stop duplicate SMSs, and I'm not sure if Google Mail does message-ID based duplicate elimination (it's been in 'man procmailex' for about 20 years). | 16:45 |
| nkinkade | paulproteus: We're talking about SMS here. | 16:45 |
| nkinkade | yup. | 16:45 |
| paulproteus | You could have a7 SMS you and CC: a8. | 16:46 |
| nkinkade | I'll just have to determine a better "is host up?" test. | 16:46 |
| paulproteus | If a8 gets the message it would have sent within one minute of it wanting to send it, it doesn't. | 16:46 |
| paulproteus | I think that's how Nagios master-slave should work. | 16:46 |
| nkinkade | I'd probably have to write a plugin for that. | 16:47 |
| paulproteus | Yeah, it's probably not worth your time to do it, but it seems to me it's "clearly" how Nagios should handle it. | 16:47 |
| nkinkade | There may already be a plugin of some sort. I'll just have to poke around. | 16:49 |
| nkinkade | Nagios does have ways of running remote checks. | 16:49 |
| paulproteus | Ah, right, that's true. | 16:49 |
| mlinksva | nkinkade: thanks for taking care of it, and always glad to see more rigorous checks paulproteus and more rigor in general :) | 16:53 |
| paulproteus | Mighty fine rigor. | 16:53 |
| *** CriticalDozen has joined #cc | 16:56 | |
| *** CriticalDozens has quit IRC | 17:13 | |
| *** stevel_ has joined #cc | 17:15 | |
| *** is4 has quit IRC | 17:18 | |
| *** Bovinity has joined #cc | 17:22 | |
| *** pandadave has left #cc | 17:27 | |
| *** stevel has quit IRC | 17:30 | |
| *** sama has quit IRC | 17:30 | |
| *** CIA-61 has quit IRC | 17:31 | |
| *** rohitj has joined #cc | 17:43 | |
| paulproteus | nkinkade, Any thoughts...? | 17:52 |
| nkinkade | paulproteus: About drupal/civicrm -> git? | 17:54 |
| * paulproteus nods | 17:54 | |
| nkinkade | One thing is confusing me. gitk shows a slightly different tree for cc_production and the cc_staging I made yesterday. | 17:55 |
| nkinkade | And I just now got zapped by the master -> master (non-fast forward) issue. | 17:55 |
| paulproteus | I can't see what you see unless you push them. | 17:55 |
| *** mecredis has joined #cc | 17:55 | |
| nkinkade | They are pushed, I think. | 17:55 |
| paulproteus | master -> master (non-fast forward) is no big deal. | 17:55 |
| paulproteus | Okay. | 17:55 |
| mecredis | Bovinity: nkinkade <li>s are acting strange | 17:56 |
| mecredis | http://creativecommons.org/weblog/entry/11015 | 17:56 |
| Bovinity | mecredis: bah. thx, taking a look. | 17:56 |
| mecredis | think they just need some padding | 17:56 |
| paulproteus | I like your merged_cc tree. | 17:57 |
| paulproteus | I'm going to run out for 30m or so. | 17:57 |
| mecredis | Bovinity: thanks | 17:57 |
| paulproteus | nkinkade, http://code.creativecommons.org/viewgit?p=pootle.git doesn't show those branches. | 18:04 |
| paulproteus | So I disagree that they are pushed. | 18:04 |
| nkinkade | Pootle? | 18:04 |
| mecredis | heh | 18:05 |
| mecredis | nice fix Bovinity | 18:05 |
| paulproteus | Er | 18:05 |
| paulproteus | Oops | 18:05 |
| paulproteus | Got Pootle on the brain. | 18:05 |
| paulproteus | http://code.creativecommons.org/viewgit?p=drupal.git doesn't show 'em either, though. | 18:05 |
| paulproteus | So there. | 18:05 |
| paulproteus | (-; | 18:05 |
| Bovinity | mecredis: yes, bandaid, there still remains some minor li style issues | 18:05 |
| nkinkade | Drupal? | 18:05 |
| nkinkade | paulproteus: Try http://code.creativecommons.org/viewgit?p=civicrm,git | 18:06 |
| paulproteus | Oh! | 18:06 |
| paulproteus | Okay. | 18:06 |
| nkinkade | :-) | 18:06 |
| nkinkade | Sorry, I wasn't clear. | 18:06 |
| nkinkade | The merged_cc stuff was yours. | 18:06 |
| nkinkade | On the drupal repository. | 18:06 |
| paulproteus | Right. | 18:06 |
| paulproteus | Okay, so what's your question? | 18:07 |
| paulproteus | Why are the trees different? | 18:07 |
| paulproteus | on cc_staging vs. cc_production | 18:07 |
| paulproteus | I have the same question for you (-: | 18:07 |
| paulproteus | Why do those branches not share more history? | 18:07 |
| paulproteus | Shouldn't the top commit at http://code.creativecommons.org/viewgit?p=civicrm.git;a=shortlog;h=refs/heads/cc_production be part of the cc_staging history, too? | 18:08 |
| nkinkade | paulproteus: I was wondering that too. | 18:09 |
| paulproteus | nkinkade, Dude. | 18:09 |
| paulproteus | You're the one who made them. | 18:09 |
| nkinkade | I thought I created the cc_staging branch the same way I had done for cc_production. | 18:09 |
| paulproteus | "Because you did it that way" | 18:09 |
| paulproteus | Here's how I would have made them. | 18:09 |
| paulproteus | Start at the cc_staging branch, all checked out. | 18:09 |
| paulproteus | And then: | 18:09 |
| paulproteus | git branch cc_production | 18:09 |
| paulproteus | Er, reversed. | 18:09 |
| paulproteus | Start w/ cc_production, all checked out, then git branch cc_staging ; git checkout cc_staging ; add stuff. | 18:10 |
| paulproteus | You branched off the release instead of cc_production. | 18:10 |
| nkinkade | I did a "git checkout --track -b cc_staging origin/tags/2.0.3" | 18:10 |
| paulproteus | (bye | 18:10 |
| Bovinity | that makes sense if you mean to reset cc_production, and start fresh from staging | 18:11 |
| nkinkade | Reset cc_production? | 18:12 |
| nkinkade | As far as I know I didn't touch cc_production. That was the same method I used to create cc_production. | 18:13 |
| nkinkade | Did paulproteus just leave? | 18:14 |
| Bovinity | oh, ok, nevermind then, that's not hte ulterior motive i though it could be. | 18:14 |
| nkinkade | I wasn't sure that cc_staging should be a branch of the cc_production branch. | 18:15 |
| nkinkade | But it seems that paulproteus is saying that it should be. | 18:15 |
| Bovinity | yes, as a starting point, it should be | 18:16 |
| nkinkade | I guess in our subversion models it's more like productions is branched from staging, but I guess with git it's six of one half dozen of another. | 18:16 |
| nkinkade | As the branch is simply a commit reference. | 18:16 |
| Bovinity | prdocution branch will merge in origin/cc_staging, as we do with SVN | 18:16 |
| nkinkade | "merge in"? | 18:17 |
| Bovinity | damn, i'm using the wrong terminology i expect | 18:17 |
| Bovinity | i'll refrain from butchering any more of this and wait for asheesh to get back. | 18:18 |
| nkinkade | Nomeclature and terminology aside, I'm just going to delete the cc_staging branch and then make it a branch of cc_production. | 18:18 |
| Bovinity | sounds good | 18:20 |
| *** is4 has joined #cc | 18:22 | |
| paulproteus | rehi | 18:28 |
| paulproteus | Your idea is solid re: "delete the cc_staging branch and then make it a branch of cc_production" | 18:29 |
| paulproteus | That plan is good. | 18:29 |
| paulproteus | But I want to make sure we share a clarity of thought. | 18:29 |
| paulproteus | So now let me know when *you*'re here. | 18:30 |
| * paulproteus sighs | 18:33 | |
| paulproteus | I feel like http://smcv.pseudorandom.co.uk/2008/11/nonblocking/ . | 18:33 |
| nathany | mecredis: are you coming to boston for the tech summit/board mtg? (just curious) | 18:34 |
| mecredis | yes sir | 18:34 |
| mecredis | i'll be there for the night of 11th / 12th | 18:34 |
| *** C2H5OH has joined #cc | 18:37 | |
| paulproteus | Hello C2H5OH. | 18:38 |
| C2H5OH | Hello | 18:39 |
| paulproteus | How are you? What brings you to #cc? | 18:39 |
| paulproteus | Let me know if you have any questions not answered in the topic. | 18:40 |
| * Bovinity smirks | 18:40 | |
| *** C2H5OH has left #cc | 18:40 | |
| * paulproteus rattles the tip jar | 18:40 | |
| paulproteus | The last time I assumed someone was a carder, he turned out to be interested in translating the license chooser to some language. | 18:40 |
| paulproteus | So best to be gentle! | 18:41 |
| nkinkade | paulproteus: Do you base those guesses on username and domain? | 18:55 |
| paulproteus | nkinkade, Yes. | 18:56 |
| paulproteus | Also lack of talking. | 18:56 |
| paulproteus | Life with airlines is stupid. | 18:56 |
| nkinkade | Ethanol. | 18:56 |
| paulproteus | For $300 I can fly from Rochester to Philadelphia non-stop. | 18:56 |
| nkinkade | Wow. What a bargain. | 18:57 |
| paulproteus | Or I can buy a $125 ticket to Baltimore from Rochester via PHL and throw away the extra leg to Baltimore. | 18:57 |
| paulproteus | My mistake, the direct flight is $410 without the disposable Baltimore leg. | 18:57 |
| paulproteus | They are literally paying me three hundred dollars to waste a seat. | 18:58 |
| paulproteus | Well, all but literally. | 18:58 |
| *** jgay has quit IRC | 18:59 | |
| paulproteus | Anyway, do you have clarity of thought on the git branching stuff? | 18:59 |
| nkinkade | paulproteus: I blasted the local and remote cc_staging branch and simply made it a branch of cc_production. | 18:59 |
| paulproteus | I agree with your actions. Do they make sense to you? | 19:00 |
| nkinkade | paulproteus: A little, but it's not precisely clear to me why branching off of tags/2.0.3 would be wrong. | 19:01 |
| nkinkade | ... or less than ideal. | 19:01 |
| paulproteus | Because you want the changes in cc_production that were made on top of tags/2.0.3. | 19:02 |
| paulproteus | So if you want them, get them. | 19:02 |
| paulproteus | The key is to remember that in git, branches are just labels for particular commits. | 19:02 |
| nkinkade | paulproteus: But the workflow will be the othe way around. | 19:02 |
| paulproteus | So two branches can point to the same commit. | 19:02 |
| nkinkade | And wasn't that what I had before, when both were branched from the same commit (release of 2.0.3)? | 19:03 |
| paulproteus | But there were changes in cc_production you wanted in cc_staging, right? | 19:03 |
| paulproteus | Here, imagine this: | 19:03 |
| paulproteus | $ git branch cc_production tags/2.0.3 | 19:03 |
| paulproteus | $ git branch cc_staging tags/2.0.3 | 19:04 |
| nkinkade | paulproteus: Would you like to try Ekiga? | 19:04 |
| paulproteus | If you do that and look at gitk, you would see that the very commit that is tags/2.0.3 has three labels on it: "tags/2.0.3", "cc_production", and "cc_staging" | 19:04 |
| nkinkade | And chat in combination? | 19:04 |
| nkinkade | (#cc, I mean) | 19:04 |
| paulproteus | Hmm, I'm in a library. | 19:04 |
| * paulproteus nods | 19:04 | |
| nkinkade | Oh. | 19:04 |
| paulproteus | My laptop has a mic but no video, also. | 19:04 |
| paulproteus | I wonder if I get the wifi outdoors. | 19:05 |
| paulproteus | I'll check. | 19:05 |
| paulproteus | I have the battery to support it. | 19:05 |
| nkinkade | Video doesn't matter, but voice would be interesting. | 19:05 |
| paulproteus | And Princeton handed me a frickin' globally-routable address and as far as I can tell no firewall, and no splash page telling me I should agree to some stupid terms of service. | 19:05 |
| paulproteus | I just DHCP'd and got a global IP on the guest network. | 19:05 |
| *** CIA-37 has joined #cc | 19:05 | |
| nkinkade | Wow. So kind of Princeton. | 19:06 |
| nkinkade | So, what's the problem with the last scenario? | 19:06 |
| nkinkade | Or are you looking into wifi? | 19:06 |
| paulproteus | I'm going to get up and see what happens if I go outside. | 19:07 |
| paulproteus | I'm having trouble with pulseaudio and the mic, I think. | 19:14 |
| nkinkade | Hmm. | 19:14 |
| *** grahl has joined #cc | 19:15 | |
| nkinkade | paulproteus: Do you have a sip address? | 19:15 |
| paulproteus | Sure, though I'm not logged in. | 19:15 |
| paulproteus | I am probably paulproteus@ekiga. | 19:15 |
| nkinkade | Hmm. Ekiga just told me that registration of edaknik failed. | 19:16 |
| paulproteus | I'm also a bunch of stuff @supercore.laroia.net. | 19:16 |
| Bovinity | paulproteus: does a CC fan named Ethan ring a bell? | 19:18 |
| paulproteus | Ethan J? | 19:19 |
| Bovinity | he's here! | 19:19 |
| Bovinity | surprise! | 19:19 |
| paulproteus | Jacovi? | 19:19 |
| paulproteus | Eek. | 19:19 |
| paulproteus | Surprise 'cause I'm not! | 19:19 |
| nathany | yup | 19:19 |
| paulproteus | I don't remember telling him to go to CC. | 19:19 |
| paulproteus | How silly. | 19:19 |
| Bovinity | wasn't there a dude who was going to come by on Friday? | 19:20 |
| Bovinity | different one? | 19:20 |
| paulproteus | Different one. | 19:20 |
| paulproteus | Luis. | 19:20 |
| paulproteus | Um, send him my regards. I hope he doesn't think we scheduled this. | 19:21 |
| nathany | paulproteus: i don't think he does | 19:21 |
| nathany | jen's giving him a t-shirt :) | 19:21 |
| Bovinity | i think jen set him straight | 19:21 |
| paulproteus | Yay! | 19:21 |
| paulproteus | Tell him to feel free to call me right now. | 19:22 |
| paulproteus | 585 506 8865 | 19:22 |
| paulproteus | If he hasn't left yet. | 19:22 |
| paulproteus | nkinkade, Let's do voice later. | 19:26 |
| paulproteus | I will be more settled tomorrow 2h from this time. We can try then. | 19:26 |
| paulproteus | Well, let me try one thing... | 19:26 |
| nkinkade | paulproteus: We can try again tomorrow. | 19:29 |
| nkinkade | And Ekiga isn't registering for some reason. | 19:29 |
| nathany | paulproteus: the one with a UCSD shirt said he'll find you on IRC | 19:30 |
| paulproteus | Okay, cool. | 19:30 |
| paulproteus | I don't know anyone well who went to UCSD, I think. | 19:30 |
| paulproteus | Maybe IRC will soon prove me wrong. | 19:30 |
| paulproteus | nkinkade, Sorry to always put this off! | 19:30 |
| paulproteus | I'm glad my mysterious friends came by. | 19:32 |
| paulproteus | I guess this is why my other friends tell me to let them know before I try to visit them. | 19:33 |
| Bovinity | your notifications need improvement | 19:36 |
| paulproteus | Well, two years ago Chris stopped by without notice and this year, we planned the trip. | 19:36 |
| paulproteus | Similarly, I now generally notify friends when I want to visit them. | 19:37 |
| *** Ekushey has joined #cc | 19:40 | |
| nathany | mlinksva: Bovinity: you guys doing curry today? | 20:00 |
| Bovinity | nathany: nope | 20:01 |
| mlinksva | nathany: y | 20:01 |
| nathany | mlinksva: let me know when you want to go | 20:01 |
| mlinksva | now, ahora, hima | 20:01 |
| *** [mharrison] has joined #cc | 20:05 | |
| *** tvol has joined #CC | 20:14 | |
| *** rohitj has quit IRC | 20:39 | |
| *** balor has quit IRC | 20:57 | |
| *** [mharrison] has quit IRC | 21:10 | |
| nkinkade | paulproteus: git submodules are pinned to a particular revision, as I understand it. How do I get git to update the submodule to a newer revision? Would this require editing .gitmodules? | 21:22 |
| paulproteus | nkinkade, No. What you do is: | 21:22 |
| paulproteus | $ cd the-submodule | 21:22 |
| paulproteus | $ git checkout <revision_you_want> | 21:22 |
| nkinkade | Ah., | 21:22 |
| paulproteus | $ cd .. | 21:22 |
| paulproteus | git add the-submodule | 21:22 |
| paulproteus | Or even before you do "git add", take a look at "git status" | 21:22 |
| nkinkade | Right. git submodule status just looks at .git of the submodule, right? | 21:23 |
| paulproteus | Yup. | 21:23 |
| paulproteus | Just the current HEAD of that .git/ actually. | 21:23 |
| nkinkade | So there's no problems with treating the submodule as any old git clone? | 21:23 |
| paulproteus | There's one problem: | 21:24 |
| paulproteus | By default you don't have a branch checked out, so "commit" cannot mean anything. | 21:24 |
| nkinkade | I saw a document about that. | 21:24 |
| paulproteus | You can address by "git checkout $some_branch". | 21:24 |
| nkinkade | http://git.or.cz/gitwiki/GitSubmoduleTutorial | 21:24 |
| paulproteus | Then you can make commits, and then you can "cd .. ; git add the-submodule" | 21:24 |
| nkinkade | That's a fairly nice page. | 21:24 |
| paulproteus | Just be sure to push. | 21:24 |
| paulproteus | Ya. | 21:24 |
| nkinkade | And it goes over the scenario you just mentioned. | 21:24 |
| nkinkade | Cool. | 21:25 |
| nkinkade | I'm learning things little by little. | 21:25 |
| paulproteus | had to go through the tutorial a few times before I actually got it. (-: | 21:25 |
| nkinkade | paulproteus: Interestingly the civicrm submodule is tracking master, which tracks remote, unless I'm reading it wrong. | 21:29 |
| paulproteus | Submodules don't track anything. | 21:29 |
| nkinkade | In a9:/var/www/zupport.creativecommons.org/www.gitted | 21:29 |
| paulproteus | They're strictly pinned to a revision, not a branch. | 21:29 |
| paulproteus | Oh, in that current checkout. | 21:29 |
| nkinkade | In the example that guy gave "git branch" would show something like "(no branch)" | 21:30 |
| paulproteus | Yeah, it would in a fresh clone ; submodule init ; submodule update. | 21:30 |
| paulproteus | Someone (me?) did "git checkout master", I guess. | 21:31 |
| paulproteus | (you?) | 21:31 |
| paulproteus | (I dunno) | 21:31 |
| nkinkade | I don't think I did that. | 21:31 |
| paulproteus | Maybe it was me, then. | 21:32 |
| * paulproteus shrugs | 21:32 | |
| nkinkade | But I'm happy to see that I understood it enough to know that that was looking strange. | 21:32 |
| paulproteus | (-: | 21:33 |
| nkinkade | paulproteus: Does this seem reasonable to you, then, for the submodule civicrm "git checkout --trach -b cc_staging origin/cc_staging" | 21:35 |
| nkinkade | (--track) | 21:35 |
| nathany | paulproteus: i recall an admonition from you that nkinkade and i should be using svn 1.5's merge tracking instead of svnmerge.py | 21:35 |
| paulproteus | "git branch" | 21:35 |
| paulproteus | nathany, Yeah, it's the same as svnmerge.py but faster and server-accelerated I think. | 21:35 |
| paulproteus | Maybe the client is faster, too? | 21:35 |
| nkinkade | paulproteus: Doesn't "checkout --track -b" do the same thing, but just eliminate one step? | 21:36 |
| paulproteus | The release notes say http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword is first thing to read. | 21:36 |
| nathany | for some definition of "the same" -- do you know if our code.cc.org repos is at the latest repos schema? | 21:36 |
| nathany | got it | 21:36 |
| nathany | thanks | 21:36 |
| paulproteus | It will work with a 1.4-schema database I think. | 21:36 |
| paulproteus | nkinkade, Please do me a favor and never use "git checkout" to create a branch. | 21:36 |
| paulproteus | It's just too confusing. | 21:36 |
| paulproteus | If what you write works, I'll be shocked. | 21:37 |
| nkinkade | paulproteus: I know that it does work. | 21:37 |
| nathany | paulproteus: not according to http://subversion.tigris.org/svn_1.5_releasenotes.html | 21:37 |
| paulproteus | nathany, Good thing I can't read (?). | 21:37 |
| paulproteus | I guess it's not current-format then. | 21:37 |
| nkinkade | The -b options tells checkout to create the branch and then check it out. | 21:37 |
| paulproteus | nkinkade, /me tries it.. | 21:37 |
| paulproteus | But --track works for git-checkout? | 21:37 |
| paulproteus | I thought that was only for git-branch. | 21:37 |
| nkinkade | Yes, it does. | 21:37 |
| paulproteus | Wow, weird. | 21:38 |
| paulproteus | So I see from the man page. | 21:38 |
| paulproteus | Okay, you can do it that way... | 21:38 |
| paulproteus | I'll still suggest not doing it, since it's just Too Weird. | 21:38 |
| paulproteus | (For Me) | 21:38 |
| nkinkade | It's a bit confusing, but not any more weird than "git push origin :heads/<some branch>" to delete a remote branch. | 21:38 |
| paulproteus | Don't use refs/heads in git-push anymore. | 21:39 |
| paulproteus | It's implicit now, so best to forget about it. | 21:39 |
| nkinkade | Just a bare (!) colon? | 21:39 |
| nkinkade | What a relief. | 21:39 |
| paulproteus | git push origin :master # deletes remote master, if I'm right | 21:39 |
| nkinkade | I'll take your word for that one. | 21:39 |
| nkinkade | But what about getting git 1.6 on my laptop. | 21:40 |
| nkinkade | Intrepid only has 1.5.3. | 21:40 |
| nkinkade | 1.5.6.5 | 21:40 |
| paulproteus | git version 1.5.6.3 is what I'm running on this here laptop apparently. | 21:40 |
| paulproteus | I haven't been using it much since this trip though. | 21:40 |
| nkinkade | It seems that the implicit --track may be available in 1.5.6.5 | 21:40 |
| nkinkade | I think I've witnessed it work, and the message git emits says as much. | 21:41 |
| paulproteus | Okay, awesome. | 21:41 |
| paulproteus | That's a relief. | 21:41 |
| nkinkade | $ git branch cc_staging origin/cc_staging | 21:42 |
| paulproteus | (I believe you.) | 21:42 |
| nkinkade | Branch cc_staging set up to track remote branch refs/remotes/origin/cc_staging. | 21:42 |
| paulproteus | http://stagootle.creativecommons.org/ gets closer and closer. | 21:44 |
| nkinkade | The search function still sucks. | 21:47 |
| nkinkade | I can't see why it doesn't return a list of strings that match and the let the user select which one, instead going to the first and offering you a "Skip" button. | 21:48 |
| nkinkade | Maybe I just don't know how to use the interface. | 21:48 |
| nathany | paulproteus: nkinkade: we need to upgrade the svn repository on code.cc.org to 1.5 to support the new schema | 21:48 |
| nathany | thoughts on whether we should: | 21:49 |
| *** tvol has quit IRC | 21:49 | |
| nkinkade | nathany: Do you know what that involves? I've never done it. | 21:49 |
| paulproteus | I read in the release notes how, and it didn't seem bad. | 21:49 |
| nathany | there are a few options | 21:49 |
| paulproteus | There's some Python script you can use to regenerate some indices. | 21:49 |
| nathany | dump/load is the common way | 21:49 |
| nathany | paulproteus: i think you're only talking about svnmerge | 21:49 |
| paulproteus | nathany, I think you're right. | 21:49 |
| paulproteus | Is there an uncommon way? | 21:50 |
| nathany | there's also an "svnadmin upgrade" you can do that does the minimal amount of work | 21:50 |
| nathany | so your repos may be "sub-optimal" | 21:50 |
| paulproteus | Right, svnadmin upgrade'. | 21:50 |
| paulproteus | "After running svnadmin upgrade, you may wish to also run the svn-populate-node-origins-index program" | 21:50 |
| paulproteus | Is that all the work it skips? | 21:51 |
| paulproteus | -- http://subversion.tigris.org/svn_1.5_releasenotes.html#repos-upgrades | 21:51 |
| paulproteus | FWIW, if we start filing bugs en masse against Pootle Bugzilla, we can probably fix them / get them fixed. | 21:51 |
| nathany | no idea | 21:51 |
| paulproteus | Looks to me like it is, based on that paragraph. | 21:51 |
| nathany | i love that they link to a C source file there | 21:52 |
| * nathany rolls eyes | 21:52 | |
| paulproteus | I love it too. | 21:52 |
| nathany | (although it seems to be installed as a binary on a7) | 21:53 |
| paulproteus | Yay! | 21:53 |
| paulproteus | Well, svnadmin upgrade seems very sane to me then. | 21:53 |
| nathany | hrm | 21:53 |
| nathany | well i guess i'll make a backup "just in case" and then try to do it live | 21:53 |
| paulproteus | By and large, the svn folks are nothing if not conservative and reasonable. | 21:53 |
| nathany | (of course, we have a 1.5GB repository :) ) | 21:54 |
| paulproteus | paulproteus@rose:~ $ du -sh svnned/music | 21:55 |
| paulproteus | 109Gsvnned/music | 21:55 |
| paulproteus | A few days ago, I put my music collection into a Subversion repository. | 21:55 |
| paulproteus | I upgraded to svn 1.5 before doing that! | 21:55 |
| nathany | uh... why? (nevermind...) | 21:55 |
| paulproteus | So when I fix tags or get new music, I can commit and "svn up" everywhere! | 21:55 |
| paulproteus | + http://scord.sourceforge.net/ | 21:56 |
| * nathany tries to decide if upgrading the svn repos now is a good use of his time | 21:58 | |
| nkinkade | paulproteus: Why didn't you use git? The blob model wouldn't work for music? | 21:58 |
| paulproteus | It would work great, but I don't get the possibility of using scord to save space. | 21:58 |
| paulproteus | Plus whole-history seemed like bad news. | 21:58 |
| paulproteus | I'll end up wanting to check out parts of the tree. | 21:58 |
| paulproteus | And if I "svn rm" something, I don't want to keep paying the price. | 21:58 |
| nathany | basically every thing I ever bitch about wrt git ;) | 21:58 |
| nathany | (j/k) | 21:58 |
| paulproteus | Well, "svn commit" took like 12 hours. | 21:59 |
| paulproteus | Anyway, I'm going afk for a few hours, but I'll be back online later. | 21:59 |
| paulproteus | nathany, Feel free to tell me (or NK) to upgrade the repo. | 21:59 |
| nkinkade | paulproteus: one thin | 21:59 |
| nkinkade | g | 21:59 |
| paulproteus | Sure. | 21:59 |
| nathany | (making a backup now) | 21:59 |
| nkinkade | I think I'm going to version all those DAO and mysql files in CiviCRM. | 21:59 |
| nkinkade | Can you think of a reason not to? | 21:59 |
| nkinkade | (the generated files) | 22:00 |
| paulproteus | I guess we decided they won't mess up merges. | 22:00 |
| nkinkade | I want a git clone to be usable. | 22:00 |
| paulproteus | Well, that's not very true. | 22:00 |
| paulproteus | Here's the bad case: | 22:00 |
| nkinkade | Right, since they aren't in the releases or their repository. | 22:00 |
| paulproteus | 1. You version them | 22:00 |
| paulproteus | 2. The rebuild clobbers them | 22:00 |
| paulproteus | 3. You commit the changed files, but | 22:00 |
| nkinkade | What rebuild? | 22:00 |
| paulproteus | Rebuild from a merge or other sort of upgrade. | 22:00 |
| paulproteus | 4. It turns out there's some old generated files that are still around but shouldn't be, causing CiviCRM to do something weird. | 22:01 |
| paulproteus | If 4 is possible, then that would suck. | 22:01 |
| paulproteus | If it's not, then whatevs. | 22:01 |
| nkinkade | I'm not 100%, but I think those files have to be manually generated from a script. | 22:01 |
| paulproteus | "manually generated from a script" means "you run the script and it makes them"? | 22:01 |
| nkinkade | I think that may be the case. | 22:01 |
| paulproteus | Not very manual, but more manual than git clone. | 22:01 |
| nkinkade | They certainly aren't generated on the fly by CiviCRM ... at least I"m pretty sure not. | 22:01 |
| paulproteus | I'd rather have two commands to get a *working* working copy than have possible weirdness down the road. | 22:02 |
| paulproteus | But it's probable that my (4) is not actually possible, and the only problem you'll see is cruft growth. | 22:02 |
| nkinkade | paulproteus: that makes sense, and thus why I asked you. :-) | 22:02 |
| nkinkade | I guess I'll leave them out. I'll just have to learn how to regenerate them later, which should be easy enough. | 22:02 |
| nkinkade | They are currently strewn about cc_staging. | 22:03 |
| nkinkade | When I dropped our current install on top, but they aren't tracked. | 22:03 |
| * paulproteus nods | 22:03 | |
| nkinkade | I guess I could delete them, and the work to see how one regenerates them. | 22:03 |
| paulproteus | For sanity gitignore them. | 22:03 |
| * paulproteus vanishes | 22:03 | |
| *** pandadave_ has joined #cc | 22:07 | |
| nathany | paulproteus: nkinkade: any idea why a7 has svn 1.5 but a6 only has 1.4? | 22:09 |
| nkinkade | nathany: Not sure. | 22:10 |
| nathany | paulproteus: nkinkade | 22:10 |
| nathany | paulproteus: nkinkade: I'm bailing on the svn repo upgrade | 22:10 |
| nkinkade | I think paulproteus installed a backport recently. | 22:10 |
| nathany | (just FYI) | 22:10 |
| nkinkade | And I forget why, but he had some good reason. | 22:10 |
| nathany | i'm sure | 22:10 |
| nkinkade | I think it had something to do with Mozootle and a feature that needed 1.5 | 22:11 |
| *** CriticalDozen has quit IRC | 22:17 | |
| *** CriticalDozen has joined #cc | 22:18 | |
| CriticalDozen | With the http://creativecommons.org/licenses/by-sa/3.0/ - Are people requried to get my premission to released a modifed piece of work? | 22:18 |
| CriticalDozen | release* | 22:18 |
| Bovinity | no, but by-nd would | 22:19 |
| CriticalDozen | Hmmm | 22:21 |
| CriticalDozen | Thanks Bovinity, think i'll just use by-sa as it's a template | 22:23 |
| *** rohitj has joined #cc | 22:51 | |
| *** Ekushey- has joined #cc | 22:56 | |
| *** Ekushey_ has joined #cc | 23:00 | |
| *** grahl has quit IRC | 23:10 | |
| *** Ekushey- has quit IRC | 23:11 | |
| *** Ekushey has quit IRC | 23:18 | |
| Bovinity | mecredis: around? | 23:36 |
| *** nathany has quit IRC | 23:50 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!