| nkinkade | nathany: 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 |
|---|---|---|
| nkinkade | I've got Drupal up to 6.9, but still need to get CiviCRM up to 2.1.x. | 00:25 |
| nkinkade | Which I'll probably tackle tomorrow morning. | 00:26 |
| *** nathany has quit IRC | 00:27 | |
| *** nathany has joined #cc | 00:27 | |
| *** Bovinity has quit IRC | 00:52 | |
| *** NotADJ has quit IRC | 00:52 | |
| *** K`Tetch_ has quit IRC | 00:52 | |
| *** isforinsects has quit IRC | 00:52 | |
| *** ianweller has quit IRC | 00:52 | |
| *** paulproteus has quit IRC | 00:52 | |
| *** CIA-36 has quit IRC | 00:52 | |
| *** m3cr3d1s has quit IRC | 00:52 | |
| *** UncleCJ2_ has quit IRC | 00:52 | |
| *** nkinkade has quit IRC | 00:52 | |
| *** UncleCJ has quit IRC | 00:52 | |
| *** stevel has quit IRC | 00:52 | |
| *** _stink_ has quit IRC | 00:52 | |
| *** freer has quit IRC | 00:52 | |
| *** ianweller has joined #cc | 00:54 | |
| *** paulproteus has joined #cc | 00:54 | |
| *** UncleCJ2_ has joined #cc | 00:54 | |
| *** CIA-36 has joined #cc | 00:54 | |
| *** m3cr3d1s has joined #cc | 00:54 | |
| *** stevel has joined #cc | 00:54 | |
| *** _stink_ has joined #cc | 00:54 | |
| *** freer has joined #cc | 00:55 | |
| *** nkinkade has joined #cc | 00:55 | |
| *** UncleCJ has joined #cc | 00:55 | |
| *** Bovinity has joined #cc | 00:55 | |
| *** K`Tetch_ has joined #cc | 00:55 | |
| *** NotADJ has joined #cc | 00:55 | |
| *** nkinkade has left #cc | 01:00 | |
| *** nargon has quit IRC | 01:01 | |
| *** nargon has joined #cc | 01:12 | |
| *** stevel has quit IRC | 01:21 | |
| *** isforinsects has joined #cc | 01:28 | |
| *** nargon has quit IRC | 02:00 | |
| *** nargon has joined #cc | 02:00 | |
| *** Bovinity has quit IRC | 02:05 | |
| *** cacimar has joined #cc | 02:19 | |
| *** CIA-36 has quit IRC | 03:49 | |
| *** CIA-35 has joined #cc | 03:57 | |
| *** paulproteus has quit IRC | 03:58 | |
| *** paulproteus has joined #cc | 03:59 | |
| paulproteus | Tackle and cackle. | 04:25 |
| *** tanjir has joined #cc | 05:08 | |
| *** cacimar has quit IRC | 06:13 | |
| *** tanjir has quit IRC | 07:08 | |
| *** [mharrison] has joined #cc | 08:21 | |
| *** sama has joined #cc | 08:32 | |
| *** CIA-35 has quit IRC | 09:10 | |
| *** K`Tetch_ has quit IRC | 09:10 | |
| *** NotADJ has quit IRC | 09:10 | |
| *** CIA-35 has joined #cc | 09:11 | |
| *** K`Tetch_ has joined #cc | 09:11 | |
| *** NotADJ has joined #cc | 09:11 | |
| *** Ekushey has joined #cc | 09:34 | |
| *** UncleCJ2_ has quit IRC | 11:27 | |
| *** Ekushey has quit IRC | 11:42 | |
| *** Ekushey has joined #cc | 11:42 | |
| *** Ekushey has quit IRC | 12:37 | |
| *** UncleCJ2_ has joined #cc | 12:39 | |
| *** Ekushey has joined #cc | 12:55 | |
| *** Ekushey has quit IRC | 14:17 | |
| *** TRD has joined #cc | 14:21 | |
| *** mlinksva has joined #cc | 15:06 | |
| *** nkinkade has joined #cc | 15:52 | |
| *** stevel has joined #cc | 16:23 | |
| *** UncleCJ2_ has quit IRC | 16:26 | |
| *** x29a has joined #cc | 17:14 | |
| *** x29a has left #cc | 17:15 | |
| nkinkade | paulproteus: Got a second for a git-merge question. | 17:20 |
| nkinkade | ? | 17:20 |
| paulproteus | nkinkade, Sure! | 17:20 |
| nkinkade | paulproteus: So, I attempting to merge 2.1.4 of CivicCRM into our 2.0.3 stuff. | 17:21 |
| paulproteus | Cool. | 17:21 |
| nkinkade | One huge problem is that CiviCRM has updated every single file, practically with a header about copyright and version. | 17:21 |
| paulproteus | Well, if we don't have deltas, that shouldn't be much of a problem. | 17:21 |
| paulproteus | I mean, if we don't have many deltas. | 17:21 |
| nkinkade | This is causing conflicts, on virtually every file. | 17:22 |
| nkinkade | Because almost every files has the header info like: CiviCRM version 2.0 | 17:22 |
| nkinkade | And : Copyright CiviCRM LLC (c) 2004-2007 | 17:22 |
| nkinkade | Except now it reads 2.1 and 2004-2008 | 17:22 |
| nkinkade | So, I resolved to just use perl -pi to change them all in advance and that worked to an extent. | 17:23 |
| nkinkade | But I see that in other places in many of the same files they *didn't* update the same string! | 17:23 |
| nkinkade | That is, the copyright stuff shows up twice in many files, as part of some header info and also the phpdocumenter stuff. | 17:24 |
| nkinkade | paulproteus: ^^ | 17:24 |
| paulproteus | Le sigh. | 17:24 |
| nkinkade | And some they updated for 2.1 and some not! | 17:24 |
| nkinkade | I was wondering if you knew of any way to sidestep some of this. | 17:24 |
| paulproteus | Well, do we have any deltas we care about? | 17:25 |
| nkinkade | I think it's safe to say that for virtually every conflict we want the REMOTE changes. | 17:26 |
| paulproteus | You can use the merge driver called "ours". | 17:26 |
| paulproteus | Er, theirs! | 17:26 |
| nkinkade | I 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 |
| paulproteus | git merge -s theirs <branch_name> | 17:26 |
| nkinkade | paulproteus: 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 |
| nkinkade | This merging to upgrade seems difficult. | 17:27 |
| nkinkade | I 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 |
| paulproteus | There are sane workflows we can put on top, especially git merge -s theirs. | 17:28 |
| paulproteus | If that really exists. | 17:28 |
| nkinkade | paulproteus: 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 |
| paulproteus | I have to go have lunch, but I'll be back about 2 pm. | 17:29 |
| paulproteus | I did manage to fix a few more long-standing liblicense bugs, though. | 17:29 |
| *** [m_harrison] has joined #cc | 18:07 | |
| *** [mharrison] has quit IRC | 18:07 | |
| *** sama has quit IRC | 18:09 | |
| *** UncleCJ2_ has joined #cc | 18:13 | |
| *** Ekushey has joined #cc | 18:22 | |
| *** nathany has joined #cc | 18:22 | |
| *** [m_harrison] is now known as [mharrison] | 18:44 | |
| *** Ekushey has quit IRC | 19:15 | |
| *** Bovinity has joined #cc | 19:49 | |
| paulproteus | nkinkade, It's only "partial rename detection". | 20:07 |
| paulproteus | I wouldn't worry about it. | 20:07 |
| paulproteus | rehi, anyway. | 20:07 |
| nkinkade | paulproteus: 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 |
| nkinkade | But then I ran into a database upgrade problem. | 20:09 |
| paulproteus | Blargle, you should do the merge so that the history is joined. | 20:09 |
| nkinkade | I went to #civicrm and dlobo wants me to send him the db so he can figure out what is wrong. | 20:09 |
| nkinkade | paulproteus: What history? | 20:09 |
| paulproteus | Hah, nice. | 20:09 |
| paulproteus | Here's what I hope would work: | 20:10 |
| nkinkade | There isn't much, except the handful of bugs I fixed. | 20:10 |
| paulproteus | $ cd /var/www/support.creativecommons.org/ | 20:10 |
| paulproteus | $ git merge production | 20:10 |
| paulproteus | (git says okay) | 20:10 |
| nkinkade | And even those aren't there because the fixes happened before we were using git. | 20:10 |
| paulproteus | This is slow to explain on IRC. | 20:11 |
| paulproteus | But 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 |
| paulproteus | If that makes sense. | 20:11 |
| nkinkade | paulproteus: Maybe we could chat with Ekiga. | 20:14 |
| paulproteus | nkinkade, Okay | 20:15 |
| paulproteus | You're nkinkade@ekiga.net? | 20:16 |
| nkinkade | Yeah. | 20:17 |
| nkinkade | I just tried you, but it failed. | 20:17 |
| paulproteus | "User is not available" | 20:19 |
| paulproteus | ... | 20:19 |
| paulproteus | I have a real phone, too. )-: | 20:20 |
| nkinkade | Turns out I'm edaknik | 20:20 |
| nkinkade | :-) | 20:20 |
| paulproteus | "Could not connect with remote host" | 20:21 |
| nkinkade | You're paulproteus@, right? | 20:21 |
| paulproteus | Ya. | 20:21 |
| paulproteus | Epic flail. | 20:22 |
| paulproteus | JHU is probably blocking SIP, I learn. | 20:23 |
| paulproteus | Frickin' awesome. | 20:23 |
| nkinkade | Well, I can just call you. | 20:23 |
| isforinsects | JHU? | 20:24 |
| paulproteus | Ya. | 20:24 |
| isforinsects | JHU == ? | 20:24 |
| paulproteus | www.acm.jhu.edu | 20:25 |
| paulproteus | read ans # ans="c" | 20:37 |
| *** Danny_B has quit IRC | 21:23 | |
| *** TRD is now known as TRD|Zzz | 21:31 | |
| *** Danny_B has joined #cc | 21:32 | |
| *** stevel has quit IRC | 22:06 | |
| *** TRD|Zzz has quit IRC | 22:10 | |
| *** nargon has quit IRC | 22:41 | |
| *** nargon has joined #cc | 22:41 | |
| *** K`Tetch_ has quit IRC | 22:59 | |
| nkinkade | paulproteus: Did you ever experiment with the civicrm stuff? | 23:28 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!