| nkinkade | paulproteus: For the new git repo for civicrm, there are two branches cc_production and cc_staging. | 00:02 |
|---|---|---|
| paulproteus | Do they point to the same revision, out of curiosity? | 00:02 |
| nkinkade | They do. | 00:02 |
| paulproteus | Neato. | 00:03 |
| nkinkade | Now I have a question. | 00:03 |
| paulproteus | You've got questions, we've got answers. | 00:03 |
| paulproteus | And cupcakes. | 00:03 |
| nkinkade | I have a bug I reported a week or so ago. They applied my patch, now I'd like to cherry pick that commit backward into our branch. | 00:03 |
| paulproteus | I really like that slogan, actually. | 00:04 |
| paulproteus | "You've got questions, we've got cupcakes." | 00:04 |
| nkinkade | haha | 00:04 |
| nkinkade | Cupcakes could be an answer for many things. | 00:04 |
| Bovinity | are cupcakes flammable? | 00:04 |
| paulproteus | But better is how many things it's *not* an answer to. | 00:04 |
| nkinkade | I remember someone telling me once that if you didn't know the answer to something to just reply with "Margaret Thacher". | 00:04 |
| paulproteus | Thatcher? I hardly even know 'er! | 00:05 |
| nkinkade | That it was statistically most likely to be the right answer. | 00:05 |
| nkinkade | :-) | 00:05 |
| Bovinity | ah, Thatcher, now she's flammable | 00:05 |
| nkinkade | But she's no cupcake. | 00:05 |
| paulproteus | The cause of many flame-wars. | 00:05 |
| Bovinity | no, not at all | 00:05 |
| paulproteus | nkinkade, git cherry-pick $REV_ID | 00:05 |
| paulproteus | That's all you need to know, no? | 00:05 |
| nkinkade | paulproteus: So can I can cherry pick that revision directly to production, or should I pick it to staging, then merge that with production, or something like that? | 00:06 |
| paulproteus | Well, looksee. | 00:06 |
| paulproteus | Those two are equivalent. | 00:06 |
| paulproteus | Is that clear why? | 00:06 |
| paulproteus | Strictly equivalent. | 00:07 |
| nkinkade | I guess I'm confused because of the svnmerge stuff and how we've managed branches/production relative to trunk. | 00:07 |
| paulproteus | There is no record of which you pick. | 00:07 |
| paulproteus | http://www.kernel.org/pub/software/scm/git/docs/git-merge.html - "How merge works" | 00:07 |
| paulproteus | Git merge is *unlike* svn merge. | 00:07 |
| paulproteus | If you read that, you'll see that the cherry pick to staging and then merge into production is a fast-forward. | 00:07 |
| paulproteus | Might as well have this policy, IMHO: make the only thing you do with "production" be merges from "staging". | 00:08 |
| nkinkade | So if I want the change in both branches, then I should just cherry pick it to both individually? | 00:08 |
| paulproteus | In my opinion you should (1) cherry-pick it to staging, then (2) test it, then (3) merge that into production. | 00:08 |
| nkinkade | That sounds reasonable. | 00:09 |
| nkinkade | I keeps the workflow sane. | 00:09 |
| paulproteus | If you do things that way, at the end, you'll notice that production and staging always point to the same commit. | 00:09 |
| nkinkade | But you are saying that there is no difference from git's perspective to pick to staging, merge to production, and cherry picking it to both individually? | 00:10 |
| paulproteus | That's not what I said. | 00:10 |
| nkinkade | I guess I'll read that document. | 00:10 |
| paulproteus | I think that's not what I said. | 00:10 |
| nkinkade | "(07:06:52 PM) paulproteus: Those two are equivalent." | 00:10 |
| paulproteus | Yeah, I'm rereading carefully what you said now. | 00:10 |
| nkinkade | You just meant functionally equivalent. | 00:10 |
| nkinkade | ? | 00:11 |
| paulproteus | No, I misunderstood what you said. | 00:11 |
| paulproteus | Ignore what I said. (-: | 00:11 |
| paulproteus | As a reply to something you didn't say, it should be dropped. | 00:11 |
| nkinkade | What shouldn't be dropped? | 00:11 |
| paulproteus | RST | 00:11 |
| nkinkade | Now I'm misreading things. I thought you said "should." | 00:12 |
| * nkinkade goes to read about git-svn and finding a sub rev number in a git repository. | 00:12 | |
| paulproteus | Yes. Listen. Ignore the past 10 minutes of our conversation. | 00:12 |
| paulproteus | nkinkade, What I do is open up gitk and look for the svn rev. | 00:13 |
| nkinkade | Maybe that would be easiest. But I think it might be a useful tidbit to know how to do it on the command line. | 00:13 |
| paulproteus | git log | grep rxxx | 00:13 |
| nkinkade | I don't see the revision number in git log. | 00:13 |
| paulproteus | There's also a thing you can use to reconstruct git-svn metadata and then use "git svn find-rev rxxx". | 00:14 |
| paulproteus | Maybe you'd need -v or something, la di da, I'm going to leave you and git alone for now. | 00:14 |
| nkinkade | Perhaps git log needs another option .... or just run what you wrote. :-) | 00:14 |
| *** nathany has quit IRC | 00:15 | |
| paulproteus | Or surf gitweb. | 00:16 |
| *** mlinksva has quit IRC | 00:28 | |
| *** [mharrison] has quit IRC | 00:52 | |
| *** Bovinity has quit IRC | 00:57 | |
| *** jgay has quit IRC | 01:42 | |
| *** Bovinity has joined #cc | 01:44 | |
| *** mlinksva has joined #cc | 01:44 | |
| *** stevel has quit IRC | 01:54 | |
| *** skyfaller has joined #cc | 02:28 | |
| *** klutzy has joined #cc | 02:51 | |
| *** nkinkade has quit IRC | 03:21 | |
| *** scientes has joined #CC | 03:40 | |
| *** scientes has left #CC | 03:45 | |
| *** [mharrison] has joined #cc | 03:52 | |
| *** tsbtmn has joined #cc | 05:29 | |
| *** tsbtmn has left #cc | 05:29 | |
| *** Bovinity has quit IRC | 07:26 | |
| *** sama has joined #cc | 08:24 | |
| *** klutzy has quit IRC | 08:31 | |
| *** mlinksva has quit IRC | 09:25 | |
| *** mlinksva has joined #cc | 09:29 | |
| *** parkerhiggins has joined #cc | 09:48 | |
| *** sama has quit IRC | 10:32 | |
| *** sama has joined #cc | 10:32 | |
| *** mlinksva has quit IRC | 10:50 | |
| *** parkerhiggins has quit IRC | 11:54 | |
| *** rohitj has quit IRC | 11:59 | |
| *** K`Tetch_ has joined #cc | 13:53 | |
| *** K`Tetch has quit IRC | 14:02 | |
| *** mlinksva has joined #cc | 15:20 | |
| *** nkinkade has joined #cc | 15:29 | |
| *** Bovinity has joined #cc | 15:58 | |
| *** nkinkade has left #cc | 16:19 | |
| *** nkinkade has joined #cc | 16:30 | |
| *** stevel has joined #cc | 16:32 | |
| *** nathany has joined #cc | 17:08 | |
| nathany | nkinkade: ping | 17:08 |
| nkinkade | nathany: Yup. | 17:19 |
| *** Bovinity has quit IRC | 17:19 | |
| *** sama has quit IRC | 17:30 | |
| nathany | nkinkade: (sorry, i went away for a bit) | 17:45 |
| nathany | i sent you an email... | 17:45 |
| nathany | not urgent, when you get a chance... | 17:45 |
| nkinkade | nathany: I saw it. Looks like my attempt yesterday failed. | 17:46 |
| nkinkade | I'm not sure how, or even if it's possible, to have the $ORIGIN also be a CNAME record. | 17:47 |
| nkinkade | Only one name can be of type CNAME and the origin is already use in SOA and NS records, so BIND rejects it. | 17:48 |
| *** Bovinity has joined #cc | 17:48 | |
| nkinkade | There may be a workaround, but at the moment I'm not sure what to do other than setup a vhost and modrewrite the thing. | 17:48 |
| nkinkade | Maybe paulproteus knows something. | 17:48 |
| nkinkade | DNAME! | 17:51 |
| nkinkade | Interesting, but since it appears to be new to BIND9, and not being sure how many other nameservers out there actually support that RR type I'm just going to create a vhost on a6 and use mod_rewrite. | 18:02 |
| nathany | nkinkade: i don't follow that at all -- a CNAME is just an alias, which is definitely not what we want (we want a redirect) | 18:09 |
| nathany | i guess we can just point oerfeeds.info to a6, www to google and then use apache on a6 to do the initial redirects | 18:09 |
| nkinkade | nathany: An alias would work, as it does in the case of www, but in this case it can't because a name with a CNAME RR cannot have an RR of any other type, which can never work for the $ORIGIN. | 18:11 |
| nkinkade | Which must a a minimum have an SOA and one NS record. | 18:11 |
| nkinkade | I have setup a redirect on a6, but you'll have to wait for the changes to propogate. | 18:12 |
| nathany | ok, thanks :) i still don't understand the RR stuff but that's why you're around ;) | 18:12 |
| nathany | thanks for taking care of that | 18:12 |
| *** sama has joined #cc | 18:52 | |
| *** Ekushey has joined #cc | 18:55 | |
| *** sama has quit IRC | 19:38 | |
| *** stevel is now known as stevel-fence-sit | 19:39 | |
| *** stevel-fence-sit is now known as stevel | 19:40 | |
| *** [mharrison] has quit IRC | 20:27 | |
| nkinkade | m3cr3d1s: Bovinity: What was that video template on Wordpress? | 20:40 |
| nkinkade | Or example. | 20:40 |
| Bovinity | /asharedculture/ | 20:41 |
| Bovinity | oh damn, it's 12:40 | 20:41 |
| Bovinity | feels earlier than that... | 20:42 |
| m3cr3d1s | yeah, thats the one with a massive amount of attribution | 20:42 |
| nkinkade | Bovinity: I forgot (sorry), are we keeping /about/videos/, or moving that to /videos/ | 20:46 |
| nkinkade | ? | 20:46 |
| Bovinity | i think keep /about/videos, it contains other content - comics | 20:46 |
| nkinkade | Bovinity: So I'll create a new page at /videos/ with a TOC of the videos and then make that the parent page of each individual video page? | 20:47 |
| Bovinity | nkinkade: yep | 20:47 |
| nkinkade | Cool. | 20:47 |
| *** Ekushey has quit IRC | 21:58 | |
| *** jgay has joined #cc | 21:59 | |
| *** nathany has quit IRC | 22:16 | |
| Bovinity | nkinkade: on learn.cc wordpress is saying php.ini's upload_max_filesize is 4M, even though I've upped it to 15M and restarted apache. thoughts? | 22:28 |
| nkinkade | Bovinity: Are you sure you edited the right php.ini file? | 22:29 |
| nkinkade | There could perhaps be more than more ... /etc/php5/apache/php.ini? | 22:30 |
| Bovinity | nkinkade: /etc/php5/apache2/php.ini:upload_max_filesize = 15M | 22:30 |
| Bovinity | weird thing is, the value used to be 2M, not the 4M wordpress is saying | 22:30 |
| nkinkade | What's that 15 on the next line? | 22:30 |
| Bovinity | next line? | 22:32 |
| nkinkade | ; Maximum allowed size for uploaded files. | 22:33 |
| nkinkade | upload_max_filesize = 15M | 22:33 |
| nkinkade | 15 | 22:33 |
| nkinkade | There a stray "15" on the line immediately following. | 22:33 |
| nkinkade | Seems wrong to me. Not saying it's the issue, but it doesn't look right. | 22:33 |
| Bovinity | a phantom 15. no idea where that came from. | 22:34 |
| Bovinity | not that it fixes it | 22:35 |
| nkinkade | Where the upload form? | 22:35 |
| Bovinity | the add media upload form from the new post page | 22:36 |
| *** skyfaller has left #cc | 22:38 | |
| nkinkade | Bovinity: I just uploaded a 5M file. | 22:42 |
| Bovinity | ah, browser uploader appears to work fine.. flash uploader, not so much. | 22:44 |
| nkinkade | Yeah, I used the regular HTML uploader, not because I meant to but because the Flash one didn't work. I clicked the button to browse and nothing happened. | 22:45 |
| * greg-g has had very limited results with most flash uploaders | 22:46 | |
| greg-g | s/results/success/ | 22:46 |
| Bovinity | they should just use an AJAX uploader like every other app i've used with upload abilities | 22:46 |
| nkinkade | Maybe it's different in 2.7. | 22:49 |
| nkinkade | I can flick the switch any time. | 22:50 |
| nkinkade | :-) | 22:50 |
| nkinkade | I figure we should play with it a bit more on staging. | 22:50 |
| Bovinity | maybe show it to some people in office first | 22:52 |
| nkinkade | I think only Mike and you really use it in the office. | 22:53 |
| nkinkade | I guess Cameron should see it. | 22:53 |
| Bovinity | *use* it yes, but most people blog | 22:53 |
| nkinkade | But in the end, it doesn't matter anyway, because we are going to upgrade it whether people like it or not. | 22:53 |
| nkinkade | We could ask people to test drive it, but likely they won't. | 22:54 |
| Bovinity | i guess so | 22:54 |
| nkinkade | And waiting will just delay the launch. | 22:54 |
| nkinkade | What I *will* do however is to send out a warning message. | 22:54 |
| nkinkade | Alerting people that it will be changing and encouraging them to take a look at staging and to express any concerns. | 22:54 |
| Bovinity | right | 22:57 |
| K`Tetch_ | whts this, wordpress? | 23:01 |
| K`Tetch_ | I'd always used the browser uploader in 2.6, flash wasn't even an option | 23:02 |
| K`Tetch_ | the flash upload words for me in 2.7 | 23:02 |
| *** mizzz has joined #cc | 23:43 | |
| mizzz | hi | 23:44 |
| nkinkade | Hi mizzz. | 23:44 |
| *** mizzz has quit IRC | 23:48 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!