Thursday, 2009-01-22

nkinkadenathany: Bovinity: zupport is unusable for the moment.  I don't think either of you will need it, but I mention so you aren't surprised if you go there for something.00:25
nkinkadeI've got Drupal up to 6.9, but still need to get CiviCRM up to 2.1.x.00:25
nkinkadeWhich I'll probably tackle tomorrow morning.00:26
*** nathany has quit IRC00:27
*** nathany has joined #cc00:27
*** Bovinity has quit IRC00:52
*** NotADJ has quit IRC00:52
*** K`Tetch_ has quit IRC00:52
*** isforinsects has quit IRC00:52
*** ianweller has quit IRC00:52
*** paulproteus has quit IRC00:52
*** CIA-36 has quit IRC00:52
*** m3cr3d1s has quit IRC00:52
*** UncleCJ2_ has quit IRC00:52
*** nkinkade has quit IRC00:52
*** UncleCJ has quit IRC00:52
*** stevel has quit IRC00:52
*** _stink_ has quit IRC00:52
*** freer has quit IRC00:52
*** ianweller has joined #cc00:54
*** paulproteus has joined #cc00:54
*** UncleCJ2_ has joined #cc00:54
*** CIA-36 has joined #cc00:54
*** m3cr3d1s has joined #cc00:54
*** stevel has joined #cc00:54
*** _stink_ has joined #cc00:54
*** freer has joined #cc00:55
*** nkinkade has joined #cc00:55
*** UncleCJ has joined #cc00:55
*** Bovinity has joined #cc00:55
*** K`Tetch_ has joined #cc00:55
*** NotADJ has joined #cc00:55
*** nkinkade has left #cc01:00
*** nargon has quit IRC01:01
*** nargon has joined #cc01:12
*** stevel has quit IRC01:21
*** isforinsects has joined #cc01:28
*** nargon has quit IRC02:00
*** nargon has joined #cc02:00
*** Bovinity has quit IRC02:05
*** cacimar has joined #cc02:19
*** CIA-36 has quit IRC03:49
*** CIA-35 has joined #cc03:57
*** paulproteus has quit IRC03:58
*** paulproteus has joined #cc03:59
paulproteusTackle and cackle.04:25
*** tanjir has joined #cc05:08
*** cacimar has quit IRC06:13
*** tanjir has quit IRC07:08
*** [mharrison] has joined #cc08:21
*** sama has joined #cc08:32
*** CIA-35 has quit IRC09:10
*** K`Tetch_ has quit IRC09:10
*** NotADJ has quit IRC09:10
*** CIA-35 has joined #cc09:11
*** K`Tetch_ has joined #cc09:11
*** NotADJ has joined #cc09:11
*** Ekushey has joined #cc09:34
*** UncleCJ2_ has quit IRC11:27
*** Ekushey has quit IRC11:42
*** Ekushey has joined #cc11:42
*** Ekushey has quit IRC12:37
*** UncleCJ2_ has joined #cc12:39
*** Ekushey has joined #cc12:55
*** Ekushey has quit IRC14:17
*** TRD has joined #cc14:21
*** mlinksva has joined #cc15:06
*** nkinkade has joined #cc15:52
*** stevel has joined #cc16:23
*** UncleCJ2_ has quit IRC16:26
*** x29a has joined #cc17:14
*** x29a has left #cc17:15
nkinkadepaulproteus: Got a second for a git-merge question.17:20
paulproteusnkinkade, Sure!17:20
nkinkadepaulproteus: So, I attempting to merge 2.1.4 of CivicCRM into our 2.0.3 stuff.17:21
nkinkadeOne huge problem is that CiviCRM has updated every single file, practically with a header about copyright and version.17:21
paulproteusWell, if we don't have deltas, that shouldn't be much of a problem.17:21
paulproteusI mean, if we don't have many deltas.17:21
nkinkadeThis is causing conflicts, on virtually every file.17:22
nkinkadeBecause almost every files has the header info like: CiviCRM version 2.017:22
nkinkadeAnd : Copyright CiviCRM LLC (c) 2004-200717:22
nkinkadeExcept now it reads 2.1 and 2004-200817:22
nkinkadeSo, I resolved to just use perl -pi to change them all in advance and that worked to an extent.17:23
nkinkadeBut I see that in other places in many of the same files they *didn't* update the same string!17:23
nkinkadeThat is, the copyright stuff shows up twice in many files, as part of some header info and also the phpdocumenter stuff.17:24
nkinkadepaulproteus: ^^17:24
paulproteusLe sigh.17:24
nkinkadeAnd some they updated for 2.1 and some not!17:24
nkinkadeI was wondering if you knew of any way to sidestep some of this.17:24
paulproteusWell, do we have any deltas we care about?17:25
nkinkadeI think it's safe to say that for virtually every conflict we want the REMOTE changes.17:26
paulproteusYou can use the merge driver called "ours".17:26
paulproteusEr, theirs!17:26
nkinkadeI don't think we have any changes we care about at this point, because all the changes were bug fixes that I submitted and were later integrated into 2.1.17:26
paulproteusgit merge -s theirs <branch_name>17:26
nkinkadepaulproteus: Ah. Let me try that on for size.17:27
paulproteus"theirs" may not exist or quite have that name; see man git-merge.17:27
nkinkadeThis merging to upgrade seems difficult.17:27
nkinkadeI get the sense that CiviCRM hasn't done anything to make that easier ... that they expect you to just follow their regular upgrade path.17:28
paulproteusThere are sane workflows we can put on top, especially git merge -s theirs.17:28
paulproteusIf that really exists.17:28
nkinkadepaulproteus: As far as the naming, I seem to get an error from git-merge anyway that close name change detection is off because there are too many files.17:28
paulproteusI have to go have lunch, but I'll be back about 2 pm.17:29
paulproteusI did manage to fix a few more long-standing liblicense bugs, though.17:29
*** [m_harrison] has joined #cc18:07
*** [mharrison] has quit IRC18:07
*** sama has quit IRC18:09
*** UncleCJ2_ has joined #cc18:13
*** Ekushey has joined #cc18:22
*** nathany has joined #cc18:22
*** [m_harrison] is now known as [mharrison]18:44
*** Ekushey has quit IRC19:15
*** Bovinity has joined #cc19:49
paulproteusnkinkade, It's only "partial rename detection".20:07
paulproteusI wouldn't worry about it.20:07
paulproteusrehi, anyway.20:07
nkinkadepaulproteus: What I had decided to try to do was to just skip the merge and to just checkout 2.1.4 and then later manually add in the 4 or 5 files that are custom.20:08
nkinkadeBut then I ran into a database upgrade problem.20:09
paulproteusBlargle, you should do the merge so that the history is joined.20:09
nkinkadeI went to #civicrm and dlobo wants me to send him the db so he can figure out what is wrong.20:09
nkinkadepaulproteus: What history?20:09
paulproteusHah, nice.20:09
paulproteusHere's what I hope would work:20:10
nkinkadeThere isn't much, except the handful of bugs I fixed.20:10
paulproteus$ cd /var/www/
paulproteus$ git merge production20:10
paulproteus(git says okay)20:10
nkinkadeAnd even those aren't there because the fixes happened before we were using git.20:10
paulproteusThis is slow to explain on IRC.20:11
paulproteusBut anyway, if you want the above two commands to work, there has to be a path in the history between an earlier revision and where you're trying to go.20:11
paulproteusIf that makes sense.20:11
nkinkadepaulproteus: Maybe we could chat with Ekiga.20:14
paulproteusnkinkade, Okay20:15
nkinkadeI just tried you, but it failed.20:17
paulproteus"User is not available"20:19
paulproteusI have a real phone, too. )-:20:20
nkinkadeTurns out I'm edaknik20:20
paulproteus"Could not connect with remote host"20:21
nkinkadeYou're paulproteus@, right?20:21
paulproteusEpic flail.20:22
paulproteusJHU is probably blocking SIP, I learn.20:23
paulproteusFrickin' awesome.20:23
nkinkadeWell, I can just call you.20:23
isforinsectsJHU == ?20:24
paulproteus        read ans # ans="c"20:37
*** Danny_B has quit IRC21:23
*** TRD is now known as TRD|Zzz21:31
*** Danny_B has joined #cc21:32
*** stevel has quit IRC22:06
*** TRD|Zzz has quit IRC22:10
*** nargon has quit IRC22:41
*** nargon has joined #cc22:41
*** K`Tetch_ has quit IRC22:59
nkinkadepaulproteus: Did you ever experiment with the civicrm stuff?23:28

Generated by 2.6 by Marius Gedminas - find it at!