| *** is4loan_ has joined #cc | 00:12 | |
| *** is4 has quit IRC | 00:12 | |
| *** stevel has quit IRC | 00:27 | |
| *** adjohn has quit IRC | 00:39 | |
| *** Roderick__ has joined #CC | 01:12 | |
| *** Roderick_ has quit IRC | 01:31 | |
| *** Bovinity has quit IRC | 01:36 | |
| *** parkerhiggins has quit IRC | 01:51 | |
| *** Roderick__ has quit IRC | 01:54 | |
| *** Roderick_ has joined #CC | 02:01 | |
| *** mlinksva has quit IRC | 02:23 | |
| *** Roderick_ has quit IRC | 02:41 | |
| *** Roderick_ has joined #CC | 02:41 | |
| *** nkinkade has quit IRC | 02:41 | |
| paulproteus | nk... drat. | 02:57 |
|---|---|---|
| *** is4loan_ has quit IRC | 03:16 | |
| *** is4 has joined #cc | 03:19 | |
| *** Roderick_ has quit IRC | 03:20 | |
| *** Roderick_ has joined #CC | 03:23 | |
| *** is4 has quit IRC | 03:25 | |
| *** mecredis has quit IRC | 03:48 | |
| *** CIA-61 has quit IRC | 03:48 | |
| *** amorel has quit IRC | 03:48 | |
| *** NotADJ has quit IRC | 03:48 | |
| *** greg-g has quit IRC | 03:48 | |
| *** K`Tetch_ has quit IRC | 03:48 | |
| *** UncleCJ has quit IRC | 03:48 | |
| *** Roderick_ has quit IRC | 03:48 | |
| *** _stink_ has quit IRC | 03:48 | |
| *** paulproteus has quit IRC | 03:48 | |
| *** Roderick_ has joined #cc | 03:49 | |
| *** mecredis has joined #cc | 03:49 | |
| *** NotADJ has joined #cc | 03:49 | |
| *** K`Tetch_ has joined #cc | 03:49 | |
| *** amorel has joined #cc | 03:49 | |
| *** greg-g has joined #cc | 03:49 | |
| *** CIA-61 has joined #cc | 03:49 | |
| *** UncleCJ has joined #cc | 03:49 | |
| *** _stink_ has joined #cc | 03:49 | |
| *** paulproteus has joined #cc | 03:49 | |
| *** adjohn has joined #cc | 04:21 | |
| *** adjohn has quit IRC | 04:23 | |
| *** adjohn has joined #cc | 04:24 | |
| *** ideasman_42 has joined #cc | 04:48 | |
| *** ideasman_42 has left #cc | 04:48 | |
| *** is4 has joined #cc | 05:35 | |
| *** sama_ has joined #cc | 06:44 | |
| *** Roderick__ has joined #CC | 07:10 | |
| *** Roderick_ has quit IRC | 07:26 | |
| *** amorel has quit IRC | 08:25 | |
| *** adjohn has quit IRC | 08:26 | |
| *** balor has joined #cc | 08:57 | |
| *** sama_ is now known as sama | 10:36 | |
| *** Roderick__ has quit IRC | 13:04 | |
| *** stevel has joined #cc | 14:52 | |
| *** is4 has quit IRC | 15:02 | |
| *** nkinkade has joined #cc | 15:23 | |
| *** is4 has joined #cc | 15:24 | |
| *** m3cr3d1s has joined #cc | 15:32 | |
| *** mecredis has quit IRC | 15:32 | |
| *** sama has quit IRC | 15:36 | |
| *** sama has joined #cc | 15:45 | |
| *** balor has quit IRC | 15:49 | |
| *** _666 has joined #cc | 15:56 | |
| *** _666 has quit IRC | 15:58 | |
| *** manu_ has joined #cc | 16:00 | |
| *** m3cr3d1s has quit IRC | 16:13 | |
| *** K`Tetch_ is now known as K`Tetch | 16:27 | |
| *** balor has joined #cc | 16:52 | |
| *** mlinksva has joined #cc | 16:59 | |
| *** Steren has joined #cc | 17:26 | |
| Steren | hi | 17:26 |
| *** Bovinity has joined #cc | 17:40 | |
| *** Ekushey has joined #cc | 18:00 | |
| *** Steren has quit IRC | 18:13 | |
| *** everton137 has joined #cc | 18:30 | |
| *** jgay has joined #cc | 18:39 | |
| *** jgay has joined #cc | 18:40 | |
| paulproteus | nkinkade, Let me know if you need anything else re: CiviCRM + git stuff. | 18:44 |
| nkinkade | paulproteus: Funny you should ask right now. I just was starting the git clone. | 18:44 |
| nkinkade | I'll let you know. Thanks! | 18:45 |
| paulproteus | Sweet. | 18:45 |
| greg-g | I hear from the intarwebs that it is nathany's bday today? | 18:53 |
| Bovinity | beleive everything you read on the internets | 18:54 |
| greg-g | that isn't what my mom told me | 18:55 |
| paulproteus | That isn't what your mom told ME. | 18:56 |
| *** Ekushey has quit IRC | 18:58 | |
| nkinkade | paulproteus: Do you prefer git-add -p or git-add .? | 19:00 |
| nkinkade | You offer both, but I'll use whichever you have found to be most convenient. | 19:00 |
| paulproteus | nkinkade, I use 'git add -p' because it shows you hunk by hunk. | 19:02 |
| paulproteus | But... | 19:02 |
| paulproteus | You should use "git diff" first to see how big the changes are. | 19:02 |
| paulproteus | If they're enormous, you might want to shrink them by removing the $Id$ noise. | 19:02 |
| paulproteus | If they're all great, just use "git add ."; don't bother being prompted for each one. | 19:03 |
| paulproteus | If you want to throw away some, but keep most of them, git add -p. | 19:03 |
| nkinkade | paulproteus: That makes sense. I'm seeing a handful of git -> svn trash, but not too much. I'm also seeing some changes I would not have expected. | 19:04 |
| nkinkade | Changes that we didn't make, but are not consistent with tags/origin/2.0.6, though that's what we presumably have. | 19:05 |
| *** is4 has quit IRC | 19:05 | |
| paulproteus | There were quite a few such confusing changes with the MW stuff. | 19:05 |
| paulproteus | I just threw them away, for the most part. | 19:05 |
| nkinkade | It would almost appear as if there is a discrepancy between what was released as 2.0.6 and what is in svn. | 19:05 |
| * paulproteus sighs | 19:05 | |
| nkinkade | (tagged as 2.0.6) | 19:05 |
| paulproteus | One of *those* projects.... | 19:05 |
| nkinkade | I'm not sure I want to throw the changes away. | 19:06 |
| nkinkade | The site works as it is. :-) | 19:06 |
| paulproteus | Well, you could keep them, and see if they ever present a problem! | 19:06 |
| nkinkade | I don't know that it's one of *those* projects, but I don't know how else to account for some of the changes. | 19:06 |
| nkinkade | paulproteus: They can't really present a problem if they reflect the current state of the working site. | 19:07 |
| nkinkade | I'm going to join #civicrm and ask about this right now. | 19:07 |
| paulproteus | I'm going to stalk you. | 19:08 |
| nkinkade | I saw that. You're sneaky. | 19:09 |
| paulproteus | And now I'll flame you. | 19:09 |
| paulproteus | Flaming stalker! | 19:09 |
| paulproteus | Flaming stalk of wheat! | 19:09 |
| nkinkade | ... bread. Is that bread gone? | 19:12 |
| paulproteus | I hope not. | 19:13 |
| Bovinity | not yet! | 19:13 |
| nkinkade | How could it last this long without preservatives, unless it's in the fridge. | 19:14 |
| paulproteus | I think it has all-natural preservatives, maybe? | 19:14 |
| paulproteus | I did get it from Rainbow, so it's not preserved with formaldehyde or anything like that. | 19:15 |
| nkinkade | paulproteus: See #civicrm | 19:16 |
| Bovinity | how long has it been here? | 19:17 |
| paulproteus | Start of week. | 19:17 |
| paulproteus | Though I bought it on Sat. | 19:17 |
| nkinkade | paulproteus: I think I may download the tar-ball, then checkout just tags/2.0.6 and see what diffs there are. | 19:20 |
| paulproteus | Good plan. | 19:20 |
| nkinkade | If there aren't differences, then I'll have to evaluate where these were introduced. | 19:20 |
| * paulproteus nods | 19:20 | |
| paulproteus | For the MW stuff, it looked like a bunch of back-ported patches that had been accepted by upstream. | 19:20 |
| paulproteus | BTW, I'm helping you out on #civicrm (-; | 19:21 |
| nkinkade | paulproteus: I saw that. Thanks. | 19:21 |
| nkinkade | :-) | 19:21 |
| nkinkade | paulproteus: It's about 2:30 here, so I'm going to break for lunch. But when I get back I'm going to verify for myself that the tar-ball release and tags/2.0.6 are the same (or not). Then I'll go from there. | 19:24 |
| paulproteus | Coolio. | 19:25 |
| nkinkade | I guess this is a somewhat important thing to do for the sake of later merges. | 19:25 |
| nkinkade | And avoiding unnecessary conflicts. | 19:25 |
| paulproteus | Yeah, but you could always look at it around later merge time. | 19:25 |
| paulproteus | I mean, if you *really* want to procrastinate it, it's safe. (-: | 19:26 |
| nkinkade | I figure I'd rather get to the bottom of it now before we being, rather than mid journey. | 19:26 |
| nkinkade | (begin) | 19:26 |
| *** is4 has joined #cc | 19:28 | |
| *** K`Tetch_ has joined #cc | 19:31 | |
| *** K`Tetch has quit IRC | 19:31 | |
| *** is4 has quit IRC | 19:46 | |
| Bovinity | paulproteus: wow, that's some tasty hazlenut spread. | 19:47 |
| paulproteus | (-: | 19:52 |
| paulproteus | Is it nearly over? | 19:52 |
| Bovinity | it goes far | 19:52 |
| paulproteus | Indeed. | 19:52 |
| *** K`Tetch_ is now known as K`Tetch | 20:03 | |
| *** JoiIto has joined #cc | 20:28 | |
| paulproteus | Howdy JoiIto. | 20:29 |
| JoiIto | hey there | 20:29 |
| *** jgay has quit IRC | 20:57 | |
| nkinkade | paulproteus: It turns out that the 2.0.6 release matches exactly the 2.0.6 subversion tag. | 20:59 |
| nkinkade | Now I'm left with figuring out where these crazy changes came from. | 20:59 |
| nkinkade | Maybe I tagged the wrong branch in git. | 20:59 |
| *** jgay has joined #cc | 21:04 | |
| nkinkade | paulproteus: You will see on #civicrm that there is no end to my foibles. | 21:31 |
| *** stevel has quit IRC | 21:37 | |
| *** JoiIto has quit IRC | 21:41 | |
| paulproteus | nkinkade, I don't quite see that. | 22:06 |
| paulproteus | nkinkade, Oh, okay re: maybe tagged wrong branch. | 22:06 |
| nkinkade | Not maybe, I did. | 22:06 |
| nkinkade | ;-) | 22:06 |
| nkinkade | And now that I've tagged the right branch everything looks jiffy-dandy, minus those expanded subversion tags. | 22:06 |
| paulproteus | Awesome! | 22:07 |
| *** stevel has joined #cc | 22:07 | |
| *** stevel_ has joined #cc | 22:11 | |
| *** stevel has quit IRC | 22:11 | |
| *** JoiIto has joined #cc | 22:23 | |
| *** JoiIto has quit IRC | 22:29 | |
| *** JoiIto has joined #cc | 22:32 | |
| *** is4 has joined #cc | 22:35 | |
| mlinksva | paulproteus: http://labs.creativecommons.org/~paulproteus/stats/flickr-based-estimate/ is updating? | 22:44 |
| paulproteus | http://labs.creativecommons.org/~paulproteus/stats/flickr-based-estimate/2008-11-08/MSN.txt says 400M | 22:44 |
| paulproteus | Yahoo's in line with the growth I'd expect. | 22:45 |
| paulproteus | It does appear to stop nearly two weeks ago. | 22:45 |
| paulproteus | Lemme see why. | 22:45 |
| *** stevel_ has quit IRC | 22:52 | |
| paulproteus | mlinksva, There's some issue with the scraper, but the Flickr downloading is fine. | 22:58 |
| paulproteus | I've been getting emails but not worrying about them, really. | 22:59 |
| *** sama has quit IRC | 23:06 | |
| *** stevel has joined #cc | 23:08 | |
| nkinkade | paulproteus: Getting rid of the expanded $Id$ tags seems like it will be challenging. It seems that in the git-svn repository that some are expanded and some aren't. | 23:09 |
| nkinkade | So when I run that script, I get an opposite type problem. | 23:10 |
| nkinkade | There aren't hundreds of them - maybe only a couple dozen, so I'm tempted to just resolve them by hand. | 23:10 |
| paulproteus | nkinkade, The svn:keywords svn property shows which files will have it. | 23:10 |
| paulproteus | In that case: | 23:10 |
| paulproteus | git add -p | 23:10 |
| paulproteus | And say "no" to those changes. | 23:10 |
| nkinkade | Do you think that's the easiest thing at this point? | 23:11 |
| paulproteus | Yes, if there's only a few dozen. | 23:11 |
| nkinkade | Do you understand the problem I'm hitting. That is, did I explain myself well enough. | 23:11 |
| paulproteus | I think so. | 23:11 |
| paulproteus | There are spurious $Id$ related changes; only about 20-30. | 23:11 |
| nkinkade | Okay, cool. I'll just go with git add -p. | 23:11 |
| paulproteus | So "no" "no" "no" "yes" would be okay. | 23:11 |
| paulproteus | Do you understand what "git add -p" is, btw? | 23:11 |
| nkinkade | paulproteus: I think so. Something like git add ., but asking you to verify each diff before it gets added. | 23:12 |
| nkinkade | (to the index) | 23:12 |
| paulproteus | Totally right, great. | 23:12 |
| nkinkade | paulproteus: I've added and committed the changes. Should git push work here? Or will I need to do the business of tracking? Or did branch -r do that for me? | 23:24 |
| paulproteus | (1) "branch -r" means "remove branch" | 23:25 |
| paulproteus | Oh, wait, no it doesn't; that's "git branch -d". | 23:25 |
| paulproteus | You should push to a different remote branch. | 23:26 |
| paulproteus | Like: | 23:26 |
| paulproteus | git push origin cc:cc | 23:26 |
| nkinkade | Will the remote branch be created if it doesn't exists, paulproteus? | 23:29 |
| paulproteus | Yes. | 23:29 |
| nkinkade | I named the local branch cc_production, in preparation for having a cc_dev or something like that. | 23:30 |
| paulproteus | But it will not be clobbered if it has different history than what you are pushing. | 23:30 |
| paulproteus | Okay. | 23:30 |
| paulproteus | Might as well keep the remote and local branch names the same, I figure. | 23:30 |
| nkinkade | So git push origin cc_production:cc_production? | 23:31 |
| nkinkade | Wait, that doesn't seem right. I guess I'll read a bit about git push. | 23:32 |
| paulproteus | I agree with your git push command line. | 23:33 |
| nkinkade | paulproteus: But even if that push works, in the future I'll still have to use that instead of just a simple push/pull right? | 23:39 |
| nkinkade | Maybe I should just go ahead and set up the local cc_production to track the remote cc_production. | 23:40 |
| paulproteus | nkinkade, You can configure your local branch to push and pull from there, but I always forget now. | 23:40 |
| paulproteus | The easiest way would be: | 23:40 |
| paulproteus | Once you've pushed, delete the local branch. | 23:40 |
| paulproteus | Then: | 23:40 |
| paulproteus | git branch cc_production origin/cc_production | 23:40 |
| nkinkade | --track | 23:40 |
| paulproteus | And then push/pull should work. | 23:40 |
| paulproteus | --track isn't necessary with that "git branch" command since git 1.6.something, but it doesn't hurt to add it if you're not sure your version is new enough. | 23:40 |
| *** jgay has quit IRC | 23:43 | |
| nkinkade | nkinkade@npk:~/cc/git/civicrm$ git --version | 23:50 |
| nkinkade | git version 1.5.6.3 | 23:50 |
| nkinkade | :-( | 23:50 |
| nkinkade | I guess I can go for a backport or something, maybe. | 23:50 |
| paulproteus | Your laptop? Intrepid? | 23:52 |
| paulproteus | http://packages.ubuntu.com/search?keywords=git-core indicates yes. | 23:52 |
| nkinkade | Hmm. Yeah, my laptop is Intrepid. | 23:53 |
| nkinkade | I'll have to investigate that. | 23:53 |
| nkinkade | paulproteus: By the way, those spurious subversion tag changes are still lingering. How do get rid of them from the checkout? | 23:54 |
| paulproteus | git reset --hard # will remove all local changes to files that are versioned | 23:54 |
| nkinkade | git reset --hard <som | 23:54 |
| paulproteus | Once you've done the commit, that's safe. | 23:54 |
| nkinkade | You answered before I could press enter. | 23:54 |
| paulproteus | Yay. | 23:55 |
| *** mlinksva has quit IRC | 23:55 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!