Thursday, 2009-03-19

*** paulproteus has joined #cc00:00
*** lotia has joined #cc00:17
*** lotia has quit IRC00:24
*** stevel has quit IRC00:44
*** lotia has joined #cc01:12
*** K`Tetch has quit IRC01:30
*** K`Tetch has joined #cc01:37
*** nkinkade has left #cc01:50
*** mlinksva has quit IRC02:37
*** oshani has quit IRC03:08
*** lotia has quit IRC03:17
*** e_6 has quit IRC03:24
*** mlinksva has joined #cc03:26
*** [mharrison] has quit IRC03:28
*** [mharrison] has joined #cc03:28
*** [mharrison] has quit IRC03:39
*** [mharrison] has joined #cc03:46
*** Orango|Away has quit IRC04:28
*** Orango|Away has joined #cc04:29
*** e_6 has joined #cc05:21
*** six_y has joined #cc05:24
*** everton137 has quit IRC05:28
*** e_6 has quit IRC05:45
*** e_6 has joined #cc05:59
*** six_y_ has joined #cc06:00
*** mlinksva has quit IRC06:05
*** six_y_ has quit IRC06:07
*** e_6 has quit IRC06:16
*** six_y has quit IRC06:17
*** e_6 has joined #cc06:55
*** e_6 has quit IRC07:16
*** talkout has joined #cc07:22
talkoutany gsoc mentors here?07:24
*** talkout has left #cc07:45
*** talkout has joined #cc07:46
*** Orango|Away has quit IRC07:54
*** Orango|Away has joined #cc07:55
*** keksschaf has joined #cc08:05
*** Orango|Away has quit IRC08:28
*** Orango|Away has joined #cc08:29
*** Smeggy has joined #cc08:46
*** Orango|Away has quit IRC08:47
*** talkout has quit IRC09:16
*** talkout has joined #cc09:42
*** tvol has joined #CC12:34
*** Orango has joined #cc12:57
*** Smeggy is now known as smegzzz12:59
*** everton137 has joined #cc13:33
*** lotia_ has joined #cc13:59
*** talkout has quit IRC14:13
*** jgay has joined #cc14:15
*** [mharrison] has quit IRC14:22
*** Ekushey has joined #cc14:37
*** mlinksva has joined #cc14:38
*** stevel has joined #cc14:47
*** nkinkade has joined #cc15:09
*** mlinksva has quit IRC15:12
*** nathany has joined #cc15:13
*** talkout has joined #cc15:13
*** Orango is now known as Orangooo15:26
*** lotia_ is now known as lotia15:42
*** johndoigiii_ has joined #cc15:45
*** stevel_ has joined #cc15:57
*** keksschaf has quit IRC16:07
*** stevel has quit IRC16:14
*** grahl has joined #cc16:22
*** stevel_ has quit IRC17:25
*** stevel has joined #cc17:25
*** keksschaf has joined #cc18:06
talkoutanyone here know about CC ideas for GSoC?18:31
*** talkout has quit IRC18:36
*** tvol has quit IRC19:05
paulproteustalk... yes19:13
*** papyromancer has quit IRC19:22
*** boredandblogging has quit IRC19:22
*** papyromancer has joined #cc19:22
*** boredandblogging has joined #cc19:22
*** svanzoest has left #cc19:22
nathanypaulproteus: SYN19:26
paulproteusnathany, SUP19:28
paulproteusKaitlin just showed me where RMS's office is.19:29
nathanypaulproteus: LOL... does it still say "knight for justice and hot ladies" on it?19:29
nathanypaulproteus: i just sent you a private msg re: my ping19:30
paulproteuser, I didn't go see it because I had just said something slightly negative about the FSF and felt embarrassed.19:31
paulproteusPsst, don't admit to sending me PMs!19:31
paulproteusI got distracted for a sec because I had to send Kaitlin
*** NotADJ has quit IRC19:51
*** NotADJ has joined #cc19:55
*** Orango has joined #cc20:05
*** Orango has quit IRC20:31
*** grahl has quit IRC20:38
*** [mharrison] has joined #cc20:50
nkinkadepaulproteus: I can't seem to use git-svn log to find specific svn revision numbers in our CiviCRM git repository.20:52
nkinkadeHowever, just to make sure it wasn't totally broken in general, I can such a lookup on my RoundCube git-svn checkout.20:53
nkinkadeNot 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
nkinkadeDo you think this is the result of how we're fetching and pushing?20:54
paulproteusNo, the fetching and pushing shouldn't affect that.20:56
paulproteusnkinkade, I bet you it, like, totally should work.20:56
* paulproteus loads up viewgit20:57
nkinkadepaulproteus: That did in fact work.  I was trying before in my local checkout.21:01
paulproteusIt would work there too by the definition of git commits....21:03
paulproteusLike, read "git log" for that commit ID locally and it will have the same commit log message.21:03
paulproteusGuaranteed, or your hash function back.21:03
*** johndoigiii_ has quit IRC21:06
*** johndoigiii has joined #cc21:07
nkinkadepaulproteus: If I'm working to upgrade CiviCRM on zupport, should I do a merge or a rebase?21:13
nkinkadeWe had done a merge the last time, I believe.21:13
nkinkadeBut I've heard you say to use a rebase for git-svn things.21:14
paulproteusLet'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
paulproteusMerge just makes dangerously little sense.21:14
paulproteusAnd rebase would be good if only git knew where our work began and their work ended.21:14
nkinkadepaulproteus: Cool ... just wanted to make sure.21:14
paulproteusIf 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
nkinkadeIn this case, we haven't made any revisions to the code since we last upgraded to
paulproteusFeel free to be more adventurous with rebase.21:15
paulproteusAh, cool.21:15
nkinkadeSo merge should be best?21:15
nkinkadeOr I guess I could just checkout 2.2.21:15
nkinkadeOr call 2.2 cc_staging.21:16
nkinkadeAm I off-track?21:16
paulproteusCall it cc_staging_2.2, which points at the same rev as 2.2.21:16
paulproteusAlternately 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
nkinkadeAh, so you would recommend to just leave cc_staging as it is and make a new branch?21:17
paulproteusTwo kinds of recommendations.21:17
nkinkadeI guess that makes sense ... then name isn't critical at all as long as it's obvious is for zupport/staging.21:17
nkinkadeI'll just make a local branch that tracks 2.2 and then do a checkout of that.21:18
paulproteusThe 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
paulproteusThe non-experimental one is just what you said, a new name.21:18
paulproteusThat's probably more sensible in a way.21:18
nkinkadeI'll make life easy on myself and do a clean checkout of v2.2.21:21
nkinkadeAll the changes we had made in the past were bug fixes which have already been integrated upstream anyway.21:21
*** Orango has joined #cc21:22
*** smegzzz has quit IRC21:24
*** Anders5453 has joined #cc21:32
*** lotia_ has joined #cc21:35
*** lotia has quit IRC21:36
*** Anders5453 has left #cc21:43
*** lotia has joined #cc22:01
*** johndoigiii has joined #cc22:34
*** mlinksva has joined #cc22:47
*** nathany has quit IRC22:57
*** lotia has quit IRC23:01
*** keksschaf has quit IRC23:24
*** johndoigiii has quit IRC23:40
*** Bovinity has joined #cc23:54
*** mlinksva has quit IRC23:59

Generated by 2.6 by Marius Gedminas - find it at!