| *** paulproteus has joined #cc | 00:00 | |
| *** lotia has joined #cc | 00:17 | |
| *** lotia has quit IRC | 00:24 | |
| *** stevel has quit IRC | 00:44 | |
| *** lotia has joined #cc | 01:12 | |
| *** K`Tetch has quit IRC | 01:30 | |
| *** K`Tetch has joined #cc | 01:37 | |
| *** nkinkade has left #cc | 01:50 | |
| *** mlinksva has quit IRC | 02:37 | |
| *** oshani has quit IRC | 03:08 | |
| *** lotia has quit IRC | 03:17 | |
| *** e_6 has quit IRC | 03:24 | |
| *** mlinksva has joined #cc | 03:26 | |
| *** [mharrison] has quit IRC | 03:28 | |
| *** [mharrison] has joined #cc | 03:28 | |
| *** [mharrison] has quit IRC | 03:39 | |
| *** [mharrison] has joined #cc | 03:46 | |
| *** Orango|Away has quit IRC | 04:28 | |
| *** Orango|Away has joined #cc | 04:29 | |
| *** e_6 has joined #cc | 05:21 | |
| *** six_y has joined #cc | 05:24 | |
| *** everton137 has quit IRC | 05:28 | |
| *** e_6 has quit IRC | 05:45 | |
| *** e_6 has joined #cc | 05:59 | |
| *** six_y_ has joined #cc | 06:00 | |
| *** mlinksva has quit IRC | 06:05 | |
| *** six_y_ has quit IRC | 06:07 | |
| *** e_6 has quit IRC | 06:16 | |
| *** six_y has quit IRC | 06:17 | |
| *** e_6 has joined #cc | 06:55 | |
| *** e_6 has quit IRC | 07:16 | |
| *** talkout has joined #cc | 07:22 | |
| talkout | any gsoc mentors here? | 07:24 |
|---|---|---|
| *** talkout has left #cc | 07:45 | |
| *** talkout has joined #cc | 07:46 | |
| *** Orango|Away has quit IRC | 07:54 | |
| *** Orango|Away has joined #cc | 07:55 | |
| *** keksschaf has joined #cc | 08:05 | |
| *** Orango|Away has quit IRC | 08:28 | |
| *** Orango|Away has joined #cc | 08:29 | |
| *** Smeggy has joined #cc | 08:46 | |
| Smeggy | greetings | 08:47 |
| *** Orango|Away has quit IRC | 08:47 | |
| *** talkout has quit IRC | 09:16 | |
| *** talkout has joined #cc | 09:42 | |
| *** tvol has joined #CC | 12:34 | |
| *** Orango has joined #cc | 12:57 | |
| *** Smeggy is now known as smegzzz | 12:59 | |
| *** everton137 has joined #cc | 13:33 | |
| *** lotia_ has joined #cc | 13:59 | |
| *** talkout has quit IRC | 14:13 | |
| *** jgay has joined #cc | 14:15 | |
| *** [mharrison] has quit IRC | 14:22 | |
| *** Ekushey has joined #cc | 14:37 | |
| *** mlinksva has joined #cc | 14:38 | |
| *** stevel has joined #cc | 14:47 | |
| *** nkinkade has joined #cc | 15:09 | |
| *** mlinksva has quit IRC | 15:12 | |
| *** nathany has joined #cc | 15:13 | |
| *** talkout has joined #cc | 15:13 | |
| *** Orango is now known as Orangooo | 15:26 | |
| *** lotia_ is now known as lotia | 15:42 | |
| *** johndoigiii_ has joined #cc | 15:45 | |
| *** stevel_ has joined #cc | 15:57 | |
| *** keksschaf has quit IRC | 16:07 | |
| *** stevel has quit IRC | 16:14 | |
| *** grahl has joined #cc | 16:22 | |
| *** stevel_ has quit IRC | 17:25 | |
| *** stevel has joined #cc | 17:25 | |
| *** keksschaf has joined #cc | 18:06 | |
| talkout | anyone here know about CC ideas for GSoC? | 18:31 |
| *** talkout has quit IRC | 18:36 | |
| *** tvol has quit IRC | 19:05 | |
| paulproteus | talk... yes | 19:13 |
| *** papyromancer has quit IRC | 19:22 | |
| *** boredandblogging has quit IRC | 19:22 | |
| *** papyromancer has joined #cc | 19:22 | |
| *** boredandblogging has joined #cc | 19:22 | |
| *** svanzoest has left #cc | 19:22 | |
| nathany | paulproteus: SYN | 19:26 |
| paulproteus | nathany, SUP | 19:28 |
| paulproteus | Kaitlin just showed me where RMS's office is. | 19:29 |
| nathany | paulproteus: LOL... does it still say "knight for justice and hot ladies" on it? | 19:29 |
| nathany | paulproteus: i just sent you a private msg re: my ping | 19:30 |
| paulproteus | er, I didn't go see it because I had just said something slightly negative about the FSF and felt embarrassed. | 19:31 |
| paulproteus | Psst, don't admit to sending me PMs! | 19:31 |
| nathany | LOL | 19:31 |
| paulproteus | I got distracted for a sec because I had to send Kaitlin http://www.postcardsfromyomomma.com/2008/10/09/what-mom-learned-from-aarp/ | 19:34 |
| *** NotADJ has quit IRC | 19:51 | |
| *** NotADJ has joined #cc | 19:55 | |
| *** Orango has joined #cc | 20:05 | |
| *** Orango has quit IRC | 20:31 | |
| *** grahl has quit IRC | 20:38 | |
| *** [mharrison] has joined #cc | 20:50 | |
| nkinkade | paulproteus: I can't seem to use git-svn log to find specific svn revision numbers in our CiviCRM git repository. | 20:52 |
| nkinkade | However, just to make sure it wasn't totally broken in general, I can such a lookup on my RoundCube git-svn checkout. | 20:53 |
| nkinkade | Not being able to search by svn revision ID will it hard to cherry-pick upstream revisions where all you've got is the svn revision ID. | 20:53 |
| nkinkade | Do you think this is the result of how we're fetching and pushing? | 20:54 |
| paulproteus | No, the fetching and pushing shouldn't affect that. | 20:56 |
| paulproteus | nkinkade, I bet you it, like, totally should work. | 20:56 |
| * paulproteus loads up viewgit | 20:57 | |
| paulproteus | http://code.creativecommons.org/viewgit?p=civicrm.git;a=commit;h=6405eed2bd0ec698fdabe2d3cbb33966a6039e86 | 20:57 |
| paulproteus | git-svn-id | 20:57 |
| nkinkade | paulproteus: That did in fact work. I was trying before in my local checkout. | 21:01 |
| paulproteus | It would work there too by the definition of git commits.... | 21:03 |
| paulproteus | Like, read "git log" for that commit ID locally and it will have the same commit log message. | 21:03 |
| paulproteus | Guaranteed, or your hash function back. | 21:03 |
| *** johndoigiii_ has quit IRC | 21:06 | |
| *** johndoigiii has joined #cc | 21:07 | |
| nkinkade | paulproteus: If I'm working to upgrade CiviCRM on zupport, should I do a merge or a rebase? | 21:13 |
| nkinkade | We had done a merge the last time, I believe. | 21:13 |
| nkinkade | But I've heard you say to use a rebase for git-svn things. | 21:14 |
| paulproteus | Let's make a Decision that going forward we will only rebase or cherry-pick (in this case, I'd say cherry-pick) and not merge, if we're building on svn stuff. | 21:14 |
| paulproteus | Merge just makes dangerously little sense. | 21:14 |
| paulproteus | And rebase would be good if only git knew where our work began and their work ended. | 21:14 |
| nkinkade | paulproteus: Cool ... just wanted to make sure. | 21:14 |
| paulproteus | If I knew off-hand how to tell it, I'd just tell you that. Until then, I'd say just cherry-pick your revisions on top of the new base. | 21:15 |
| nkinkade | In this case, we haven't made any revisions to the code since we last upgraded to 2.1.4. | 21:15 |
| paulproteus | Feel free to be more adventurous with rebase. | 21:15 |
| paulproteus | Ah, cool. | 21:15 |
| nkinkade | So merge should be best? | 21:15 |
| nkinkade | Or I guess I could just checkout 2.2. | 21:15 |
| nkinkade | Or call 2.2 cc_staging. | 21:16 |
| nkinkade | Am I off-track? | 21:16 |
| paulproteus | Call it cc_staging_2.2, which points at the same rev as 2.2. | 21:16 |
| paulproteus | Alternately you could re-use the old name, that's okay with me, but a little weird since there's no history path between the old cc_staging and new cc_staging. | 21:17 |
| nkinkade | Ah, so you would recommend to just leave cc_staging as it is and make a new branch? | 21:17 |
| paulproteus | Two kinds of recommendations. | 21:17 |
| nkinkade | I guess that makes sense ... then name isn't critical at all as long as it's obvious is for zupport/staging. | 21:17 |
| nkinkade | I'll just make a local branch that tracks 2.2 and then do a checkout of that. | 21:18 |
| paulproteus | The experimental kind is this one: Keep the name the same, and use "git pull --rebase" when it's time to switch in a checkout. | 21:18 |
| paulproteus | The non-experimental one is just what you said, a new name. | 21:18 |
| paulproteus | That's probably more sensible in a way. | 21:18 |
| nkinkade | I'll make life easy on myself and do a clean checkout of v2.2. | 21:21 |
| nkinkade | All the changes we had made in the past were bug fixes which have already been integrated upstream anyway. | 21:21 |
| *** Orango has joined #cc | 21:22 | |
| paulproteus | Yay. | 21:23 |
| *** smegzzz has quit IRC | 21:24 | |
| *** Anders5453 has joined #cc | 21:32 | |
| *** lotia_ has joined #cc | 21:35 | |
| *** lotia has quit IRC | 21:36 | |
| *** Anders5453 has left #cc | 21:43 | |
| *** lotia has joined #cc | 22:01 | |
| *** johndoigiii has joined #cc | 22:34 | |
| *** mlinksva has joined #cc | 22:47 | |
| *** nathany has quit IRC | 22:57 | |
| paulproteus | mlinksva, http://groups.fsf.org/index.php/Project_Suggestion_for_an_Open_Machine | 23:00 |
| *** lotia has quit IRC | 23:01 | |
| *** keksschaf has quit IRC | 23:24 | |
| *** johndoigiii has quit IRC | 23:40 | |
| *** Bovinity has joined #cc | 23:54 | |
| *** mlinksva has quit IRC | 23:59 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!