| nkinkade | Why is merging in subversion so horrificly slow? | 00:06 |
|---|---|---|
| paulproteus | If it's any consolation, that's not the only thing that's so horrifically slow in Subversion. | 00:07 |
| nkinkade | svn log --verbose is horrendous as well. | 00:12 |
| nkinkade | Maybe I really need to get on the git ship and stop bobbing around in water under it's stern. | 00:12 |
| paulproteus | These days I use git-svn for most interactions with svn projects because svn is now fun anymore. | 00:13 |
| paulproteus | Er, no fun. | 00:13 |
| *** easyboy has joined #CC | 00:21 | |
| *** easyboy has left #CC | 00:21 | |
| nkinkade | paulproteus: Would you have any good ideas about how to debug the API? | 00:28 |
| paulproteus | nkinkade, Maybe - what do you mean? | 00:29 |
| paulproteus | Is it raising an exception, or giving invalid output? | 00:29 |
| nkinkade | http://api.creativecommons.org/rest/1.5/details?license-uri=http://creativecommons.org/licenses/by/2.5/es/ | 00:29 |
| nkinkade | For example. Other parts seem to be working. | 00:29 |
| paulproteus | eep. | 00:30 |
| paulproteus | 500s should be logged wherever it keeps logs. | 00:30 |
| nkinkade | Sadly it's causing every international page to not work. | 00:30 |
| paulproteus | Double eep. | 00:30 |
| paulproteus | I wonder if this is new. | 00:30 |
| nkinkade | I looked around in the logs and nothing. | 00:30 |
| paulproteus | I would think it's new. | 00:30 |
| nkinkade | I wonder too. This may need to be a new Nagios monitor. | 00:30 |
| paulproteus | And then I wonder what change caused it. | 00:30 |
| nkinkade | I'm launching the 3.0 Spain licenses, so I did an svn up about 20 minutes ago. | 00:31 |
| nkinkade | But it only updated an external. | 00:31 |
| paulproteus | I installed fortunes-off on a8. | 00:31 |
| nkinkade | It seems to be failing for 3.0, 2.5, any jurisdiction. | 00:31 |
| paulproteus | D'oh. | 00:31 |
| paulproteus | Lemme see. | 00:31 |
| paulproteus | Path to its log? | 00:32 |
| nkinkade | Just thought you might have some better insight into debugging a python deal, since there's nothing the normal logs. | 00:32 |
| nkinkade | /var/www/api.creativecommons.org/api-1.5 | 00:32 |
| paulproteus | /var/www/api.creativecommons.org/api-1.5 ? | 00:32 |
| * paulproteus nods | 00:32 | |
| paulproteus | Great. | 00:32 |
| *** tryggvib has quit IRC | 00:32 | |
| paulproteus | /var/www/api.creativecommons.org/api-1.5/support.py:247: UserWarning: This versi | 00:32 |
| paulproteus | on of libxml2 has a known XPath bug. Use it at your own risk. | 00:32 |
| paulproteus | That's awesome. | 00:32 |
| nkinkade | paulproteus: That's been there for a long time. | 00:33 |
| paulproteus | Also awesome. | 00:34 |
| nkinkade | nathany knows about it. | 00:34 |
| nkinkade | The last time the api was updated was quite a while ago by Frank. | 00:34 |
| paulproteus | What was the external it updated, X license_xsl/i18n/i18n_po | 00:34 |
| paulproteus | ? | 00:34 |
| nkinkade | I don't see why updating some external should cause such a severe error. | 00:34 |
| nkinkade | That was one of them. | 00:34 |
| nkinkade | and also license_xsl. | 00:34 |
| nkinkade | And why it should generally work, except for those particular queries. | 00:35 |
| * paulproteus tries something | 00:35 | |
| paulproteus | a8:/var/www/api.creativecommons.org/api-1.5/license_xsl/i18n/i18n_po# svn update -r11084 . | 00:35 |
| paulproteus | That did not help. | 00:35 |
| paulproteus | http://api.creativecommons.org/rest/1.5/details?license-uri=http://creativecommons.org/licenses/by/1.0/ is also broke. | 00:36 |
| paulproteus | Does anything work? | 00:36 |
| paulproteus | Can you demo to me an API query that does work? | 00:36 |
| nkinkade | http://api.creativecommons.org/rest/1.5/locales | 00:37 |
| nkinkade | paulproteus: for example ^^ | 00:37 |
| paulproteus | Yay. | 00:37 |
| nkinkade | You'll have to view source. | 00:37 |
| nkinkade | And just plain old: http://api.creativecommons.org/rest/1.5/ | 00:37 |
| nkinkade | That works, too. | 00:37 |
| nkinkade | I tried running zdaemon in the foreground, but nothing showed up. | 00:38 |
| nkinkade | http://api.creativecommons.org/rest/1.5/support/jurisdictions | 00:38 |
| * paulproteus nods | 00:39 | |
| nkinkade | Most things seem to work, except the details? part. | 00:39 |
| paulproteus | I just did a8:/var/www/api.creativecommons.org/api-1.5# chown -R nathan . | 00:39 |
| paulproteus | to no avail. | 00:39 |
| nkinkade | Hmmm. | 00:39 |
| nkinkade | How to get log info out of it is the question. | 00:39 |
| paulproteus | What's the HTTP route? | 00:40 |
| nkinkade | api.log and zdaemon.log are silent on the issue. | 00:40 |
| paulproteus | These go over to Varnish to a zdaemon that runs its own HTTP daemon - on what port? | 00:40 |
| nkinkade | 7015? | 00:40 |
| nkinkade | 7000? | 00:40 |
| nkinkade | 7015 is api-1.5 and 7000 is api-dev, I believe. | 00:40 |
| paulproteus | nathan@a8:/etc/varnish$ grep 70 * | 00:41 |
| paulproteus | nathan@a8:/etc/varnish$ | 00:41 |
| paulproteus | I find that curious. | 00:41 |
| paulproteus | It's via Apache first, okay. | 00:41 |
| paulproteus | /var/www/api.creativecommons.org/api-apache.conf | 00:42 |
| nkinkade | It must be happending through mod_proxy. | 00:42 |
| paulproteus | Ya. | 00:42 |
| nkinkade | Right. | 00:42 |
| paulproteus | Is api-dev broken similarly?' | 00:42 |
| nkinkade | I'm not inclined to think it's Varnish or Apache since most things work. | 00:42 |
| nkinkade | api-dev seem to be broken in the same way. | 00:43 |
| paulproteus | http://api.creativecommons.org/rest/dev/details?license-uri=http://creativecommons.org/licenses/by/1.0/ | 00:43 |
| paulproteus | Yay. | 00:43 |
| paulproteus | I'm going to take that down and fiddle. | 00:43 |
| nkinkade | dev? | 00:43 |
| paulproteus | Yes, dev! | 00:43 |
| nkinkade | :-) | 00:43 |
| nkinkade | I hope this hasn't been like this for too long. | 00:43 |
| nkinkade | Seems that someone would have brought it to our attention by now if it had. | 00:44 |
| paulproteus | /var/log/apache2/api.creativecommons.org/error.log has some logs. | 00:46 |
| nkinkade | paulproteus: Yeah, I saw those. | 00:47 |
| paulproteus | [Wed Nov 12 00:44:09 2008] [error] [client 71.134.241.225] client denied by serv | 00:47 |
| paulproteus | er configuration: proxy:http://localhost:7000/details | 00:47 |
| nkinkade | But they seem to be unrelated to the present problem. | 00:47 |
| paulproteus | Those freak me out. | 00:47 |
| nkinkade | tail -f it and then access that URL. Nothing shows up. | 00:48 |
| nkinkade | And the error message is being generated by CherryPy. | 00:48 |
| paulproteus | Oh, that's for direct access. | 00:48 |
| paulproteus | If you go to api port 8080. | 00:49 |
| paulproteus | Okay. | 00:49 |
| nkinkade | And 7000 is dev, and 7015 is 1.5. | 00:49 |
| paulproteus | What's the official way to stop and start the API? | 00:49 |
| paulproteus | Maybe we should just call NY. | 00:49 |
| nkinkade | It's in /etc/rc.local | 00:49 |
| nkinkade | I may call Nathan. | 00:50 |
| nkinkade | I'm not even sure how to get the thing to log the error. | 00:50 |
| paulproteus | Oh, as root? Geez. | 00:50 |
| paulproteus | re: rc.local | 00:50 |
| nkinkade | Yeah. | 00:50 |
| Bovinity | :q | 00:50 |
| nkinkade | paulproteus: Do you think I should give Nathan a call. No more ideas? | 00:50 |
| Bovinity | doh | 00:50 |
| nkinkade | Bovinity: Tell me you know the answer. | 00:51 |
| paulproteus | Give me 3 more minutes I guess, then yeah. | 00:51 |
| Bovinity | nope, sorry. i did find my vim process, though. | 00:52 |
| nkinkade | paulproteus: I think I just found it. | 00:54 |
| paulproteus | Yes? | 00:54 |
| nkinkade | I F'ed up support.xsl in license_xsl. | 00:55 |
| paulproteus | Oh, okay. | 00:55 |
| nkinkade | There a syntax error that I introduced. | 00:55 |
| nkinkade | Interduced, I mean. | 00:55 |
| paulproteus | Of quorse. | 00:55 |
| nkinkade | Interdeuced. | 00:55 |
| paulproteus | D'oh, I should have reverted more of license_xsl! | 00:56 |
| paulproteus | Then we would have found this 30m ago. | 00:56 |
| paulproteus | I only reverted the parts that *I* had changed recently. (-: | 00:56 |
| paulproteus | (the .po files I enriched with msgctxt, "message context") | 00:56 |
| nkinkade | I'm just glad I don't have to bother Nathan on his break, especially with a small error that probably would have taken a while to find. | 00:56 |
| nkinkade | But it does bring up the issue that error reporting is a bit opaque in the api. | 00:57 |
| paulproteus | Ya. | 00:57 |
| paulproteus | Ya! | 00:57 |
| *** is4 has quit IRC | 00:59 | |
| nkinkade | There's great irony in this svn commit message: http://code.creativecommons.org/viewsvn?view=rev&revision=11166 | 01:00 |
| paulproteus | Nice. | 01:03 |
| *** kaithecat has joined #cc | 01:13 | |
| *** kaithecat has left #cc | 01:13 | |
| Bovinity | do you have to restart varnish to get cc.engine changes to take effect? | 01:13 |
| paulproteus | Waiting ca. 90s should be enough anyway. | 01:14 |
| paulproteus | I think that's all it caches for. | 01:14 |
| Bovinity | aha | 01:19 |
| *** is4 has joined #cc | 01:36 | |
| nkinkade | Bovinity: It's not necessary to restart Varnish for cc.engine stuff. | 01:36 |
| Bovinity | nkinkade: i noticed | 01:36 |
| nkinkade | In fact I'm not aware that it's necessary to restart Varnish for anything except when it wedges, which isn't often. | 01:37 |
| nkinkade | Bovinity: What do you know about deed.pt and TAL. | 01:37 |
| nkinkade | ? | 01:37 |
| Bovinity | what do you need to know? | 01:38 |
| nkinkade | I need to add another exception for the 3.0 Spain licenses. | 01:38 |
| nkinkade | I think I've got it in there correctly. | 01:38 |
| nkinkade | I think I'm just going to commit it and hope for the best. | 01:38 |
| nkinkade | in macros_templates/deed.pt. | 01:38 |
| Bovinity | oh, hmm | 01:39 |
| Bovinity | not so sure, if you're adding another exception, you should be fine | 01:39 |
| nkinkade | I assume that when something inside of a <span> with a tal:condition=, if the condition fails then the <span> isn't displayed. | 01:39 |
| nkinkade | Does that sound right? | 01:39 |
| Bovinity | correct | 01:39 |
| nkinkade | Okay, then I'm safe. Thanks. | 01:40 |
| *** Bovinity has quit IRC | 01:43 | |
| *** jgay has joined #cc | 01:52 | |
| *** mlinksva has quit IRC | 02:39 | |
| *** nkinkade has quit IRC | 03:37 | |
| *** K`Tetch_ is now known as K`Tetch | 03:38 | |
| *** tanjir has joined #cc | 04:00 | |
| *** tanjir_ has joined #cc | 04:30 | |
| *** tanjir has quit IRC | 04:30 | |
| *** Sonja has joined #cc | 04:46 | |
| Sonja | hi! | 04:47 |
| *** jgay has quit IRC | 04:48 | |
| *** tanjir_ is now known as tanjir | 05:12 | |
| *** stevel has quit IRC | 05:20 | |
| *** rohitj has quit IRC | 05:21 | |
| *** cacimar has quit IRC | 05:21 | |
| *** bustaplz has joined #cc | 05:26 | |
| *** tanjir has quit IRC | 05:39 | |
| *** bustaplz has left #cc | 05:42 | |
| *** Sonja has quit IRC | 07:03 | |
| *** jgay has joined #cc | 09:31 | |
| *** sama has joined #cc | 09:31 | |
| *** NotADJ has quit IRC | 10:00 | |
| *** NotADJ has joined #cc | 10:02 | |
| *** hdworak has joined #cc | 10:30 | |
| hdworak | hello :) | 10:30 |
| hdworak | it's been a long time no see | 10:30 |
| hdworak | paulproteus: remember when I've told you I need to take a break because I need to finish a GSoC-sized project that had a deadline much earlier than GSoC? I've completed it | 10:32 |
| hdworak | paulproteus: validator-beta DOT creativecommons.org is down for a month or so? why is that? | 10:32 |
| *** sama has quit IRC | 10:46 | |
| *** hdworak has quit IRC | 11:16 | |
| *** adjohn__ has joined #cc | 11:29 | |
| *** adjohn has quit IRC | 11:36 | |
| *** balor has joined #cc | 11:53 | |
| *** adjohn__ has quit IRC | 11:55 | |
| *** adjohn has joined #cc | 12:01 | |
| *** jgay has quit IRC | 12:02 | |
| *** adjohn__ has joined #cc | 12:28 | |
| *** adjohn has quit IRC | 12:39 | |
| *** Roderick__ has quit IRC | 13:28 | |
| *** tvol has joined #CC | 14:10 | |
| *** balor has quit IRC | 14:58 | |
| *** parkerhiggins has joined #cc | 15:36 | |
| *** mlinksva has joined #cc | 15:39 | |
| *** nkinkade has joined #cc | 15:48 | |
| *** hdworak has joined #cc | 15:52 | |
| *** parkerhiggins has quit IRC | 15:53 | |
| *** stevel has joined #cc | 16:20 | |
| *** balor has joined #cc | 16:22 | |
| *** mlinksva_ has joined #cc | 16:23 | |
| *** mlinksva has quit IRC | 16:37 | |
| *** Bovinity has joined #cc | 17:21 | |
| *** is4 has quit IRC | 17:24 | |
| *** hdworak has quit IRC | 17:37 | |
| *** jgay has joined #cc | 17:48 | |
| *** rohitj has joined #cc | 17:49 | |
| nkinkade | Bovinity: Do you happen to know when the announcements for summers interns usually get posted? | 18:45 |
| nkinkade | greg-g: You might know too. :-) ^^ | 18:45 |
| Bovinity | nkinkade: march i think | 18:45 |
| nkinkade | Thanks. | 18:45 |
| Bovinity | feburary | 18:46 |
| Bovinity | nkinkade: cc.org is getting varnish/503 errors | 18:49 |
| mlinksva_ | nkinkade: varnish guru | 18:49 |
| nkinkade | mlinksva_: Bovinity: I just got an SMS too. | 18:50 |
| nkinkade | I'll look. | 18:50 |
| greg-g | nkinkade/bovinity: yeah, feb sounds right for the initial announcement | 18:57 |
| nkinkade | Seems that it was Apache that was having a problem, though it's not clear why. There were quite a lot of Apache processes, but Varnish seemed to not be able to connect to Apache. | 18:57 |
| nkinkade | greg-g: Thanks. | 18:57 |
| *** rohitj has quit IRC | 19:31 | |
| *** is4 has joined #cc | 19:34 | |
| paulproteus | nkinkade, To let Subversion commits set arbitrary properties in the commits, it looks like I have to use svn 1.5 on the server. | 19:41 |
| paulproteus | If I promise that what I do will not interfere with an upgrade to lenny, which is coming soon, may I upgrade to svn 1.5 on a7? | 19:42 |
| nkinkade | paulproteus: I assume you're sure it won't affect code.CC.org. | 19:42 |
| paulproteus | Well, the *point* is to affect code.cc! | 19:43 |
| paulproteus | Just not *damage* it. | 19:43 |
| nkinkade | But I'm fine with the change. | 19:43 |
| nkinkade | How will you install it? apt-src? | 19:43 |
| paulproteus | I'm investigating now. | 19:43 |
| paulproteus | That's the vague plan. | 19:43 |
| nkinkade | :-) | 19:43 |
| nkinkade | paulproteus: Do I also assume that 1.5 is totally backward compatible with older versions? | 19:44 |
| paulproteus | Yes. | 19:44 |
| paulproteus | It has smarter merge support, too. | 19:44 |
| paulproteus | So it's a win in other ways, too. | 19:44 |
| nkinkade | Nice. | 19:44 |
| paulproteus | BTW, I suggest you take a moment to learn about Subversion 1.5's merge support. | 19:50 |
| paulproteus | Since you hate 1.4's so much. (-: | 19:50 |
| paulproteus | There, compiling svn package now. | 19:58 |
| paulproteus | Our Subversion on a7 won't have Java bindings enabled because I didn't feel like getting those dependencies. | 19:59 |
| * paulproteus reads http://subversion.tigris.org/svn_1.5_releasenotes.html | 19:59 | |
| paulproteus | It links to http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword as a users' guide, and http://www.collab.net/community/subversion/articles/merge-info.html as a "How it works" guide on svn 1.5 merging. | 20:02 |
| paulproteus | I think the long and short of it is that svnmerge.py semantics are part of svn core. | 20:03 |
| Bovinity | hmm | 20:03 |
| *** mikahl has joined #CC | 20:11 | |
| mikahl | Hey does anybody here know the licensing terms of Colourlovers.com content? | 20:11 |
| Bovinity | mikahl: by-nc-sa, as it says in the footer. | 20:14 |
| mikahl | right, but is that only for the web page, not necessarily the content? | 20:14 |
| Bovinity | are you concerned abotu the implications of using a palette? | 20:16 |
| nkinkade | mikahl: Maybe a Google search for "creative commons site:colourlovers.com" would return something useful. | 20:17 |
| mikahl | yes I want to use a Pattern in my film as wallpaper | 20:17 |
| mikahl | thanks nkinkade | 20:17 |
| greg-g | paulproteus: any news on liblicense? | 20:29 |
| paulproteus | greg-g, No, I'm afraid not yet. | 20:42 |
| paulproteus | nkinkade, Upgrade seems to have gone smoothly. | 20:44 |
| nkinkade | paulproteus: That's good to hear. | 20:44 |
| greg-g | paulproteus: k, just checking and all | 20:51 |
| * paulproteus nods | 20:52 | |
| *** veeliam has joined #cc | 20:59 | |
| *** balor_ has joined #cc | 21:17 | |
| *** adjohn has joined #cc | 21:18 | |
| nkinkade | Bovinity: I notice there is JS in the CiviCRM template for auto-selecting the right premium. | 21:23 |
| nkinkade | It's not working, and I've worked up something else, but I just wanted to see if you knew anything about it. | 21:23 |
| Bovinity | nkinkade: nope, i wasn't sure if such a thing existed. | 21:24 |
| nkinkade | I wonder if that JS comes with CiviCRM. | 21:24 |
| *** is4 has quit IRC | 21:25 | |
| *** is4 has joined #cc | 21:26 | |
| *** adjohn has quit IRC | 21:27 | |
| *** veeliam has quit IRC | 21:27 | |
| *** mlinksva_ has quit IRC | 21:27 | |
| *** balor has quit IRC | 21:27 | |
| *** stevel has quit IRC | 21:27 | |
| *** greg-g has quit IRC | 21:27 | |
| *** balor_ has quit IRC | 21:27 | |
| *** jgay has quit IRC | 21:27 | |
| *** NotADJ has quit IRC | 21:27 | |
| *** mecredis has quit IRC | 21:27 | |
| *** amorel has quit IRC | 21:27 | |
| *** adjohn__ has quit IRC | 21:27 | |
| *** tvol has left #CC | 21:27 | |
| *** Roderick_ has joined #CC | 21:28 | |
| *** K`Tetch has quit IRC | 21:45 | |
| *** adjohn_ has joined #cc | 21:45 | |
| *** adjohn has joined #cc | 21:45 | |
| *** veeliam has joined #cc | 21:45 | |
| *** mlinksva_ has joined #cc | 21:45 | |
| *** stevel has joined #cc | 21:45 | |
| *** greg-g has joined #cc | 21:45 | |
| *** adjohn has quit IRC | 21:47 | |
| *** balor_ has joined #cc | 21:47 | |
| *** jgay has joined #cc | 21:47 | |
| *** mecredis has joined #cc | 21:47 | |
| *** amorel has joined #cc | 21:47 | |
| *** NotADJ has joined #cc | 21:53 | |
| *** veeliam has left #cc | 22:03 | |
| *** balor_ has quit IRC | 22:08 | |
| *** [mharrison] has joined #cc | 22:57 | |
| *** [mharrison] has quit IRC | 23:17 | |
| Bovinity | nkinkade: did you get to teh bottom of that premium selection javascript? | 23:18 |
| nkinkade | Bovinity: It works now. | 23:19 |
| nkinkade | I didn't worry about the other code in the template. | 23:19 |
| nkinkade | I put my updates in support.js | 23:19 |
| Bovinity | nkinkade: aha, lookng at support.js diffs now | 23:20 |
| nkinkade | It required addition of a new function and edits to another. | 23:20 |
| nkinkade | Bovinity: I haven't checked in the changes. By the way, are we using svnmerge on that between trunk and production? | 23:20 |
| Bovinity | fld_ttl.innerHTML = "<<span style='color: red'>0</span>>"; are the double angle brackets supposed to be that way? | 23:21 |
| Bovinity | nkinkade: the theme is in its own git module | 23:22 |
| nkinkade | And support.js is part of the theme? | 23:22 |
| Bovinity | yes | 23:23 |
| nkinkade | Damn. The latest changes I've made have been directly to the support.js file. | 23:23 |
| nkinkade | I guess I should try to fix that up. | 23:23 |
| nkinkade | In fact, any changes I've made in the last month have been directly to support.js. | 23:23 |
| Bovinity | i have some theme changes to push live, so i can tidy that up if you'd rather | 23:23 |
| nkinkade | That would be awesome. | 23:24 |
| paulproteus | That's weird re: double brackets | 23:24 |
| nkinkade | I guess it would be a matter of making a backup of that file, reverting the file to some earlier state and then drop my file back and in place and commit. | 23:25 |
| nkinkade | Yeah, I'm not sure about those double brackets. | 23:25 |
| Bovinity | i imagine they should be < ... > or fat fingers were involved. | 23:25 |
| paulproteus | cout << span << endl; | 23:27 |
| nkinkade | Bovinity: It must have been a fat finger mistake on my part. I might have cut-n-pasted something. | 23:27 |
| nkinkade | I've made numerous edits to that file, and it's a shame I wasn't doing it through version control. | 23:28 |
| nkinkade | Oh, Bovinity, now I remember. | 23:28 |
| Bovinity | oh! | 23:28 |
| nkinkade | I added those there on purpose, but you're right, they should be < > | 23:29 |
| nkinkade | At one point I had angle brackets around the word "error", but later changed my mind and just put in 0, and now I don't want the angle brackets. | 23:29 |
| Bovinity | heh | 23:29 |
| paulproteus | My most-frequent svn commit command-line: | 23:30 |
| paulproteus | svn ci -m ... | 23:30 |
| nkinkade | Bovinity: I just clone the support_cc_org_theme.git, so I guess I could try to piece together my changes and commit them individually. | 23:32 |
| nkinkade | Unless you'd rather do it now in bulk. | 23:32 |
| Bovinity | oh, sure, go ahead. in the 2008 branch. | 23:33 |
| nkinkade | Bovinity: I'll see what I can do. Be prepared to have to restore that git repository from backup. | 23:34 |
| nkinkade | ;-) | 23:34 |
| Bovinity | lol | 23:34 |
| *** cacimar has joined #cc | 23:45 | |
| paulproteus | Good thing every clone is a backup! | 23:49 |
| nkinkade | Bovinity: Awww. to heck with it. | 23:50 |
| nkinkade | I think I'm just going to submit all the changes wholesale. | 23:50 |
| nkinkade | It'll be much easier than trying to pick what I've done apart and doing it more incrementally. | 23:50 |
| nkinkade | Some of the stuff I did was cosmetic. | 23:50 |
| Bovinity | yay, AOL hates us again! | 23:53 |
| *** parkerhiggins has joined #cc | 23:53 | |
| nkinkade | paulproteus: How does git handle it when there are local modifications in a checkout, but not added or committed? | 23:53 |
| paulproteus | nkinkade, Then "git diff" shows them. | 23:53 |
| paulproteus | I don't get what is the exciting part of this question. | 23:54 |
| nkinkade | Will git give me conflicts when I update? | 23:54 |
| paulproteus | git status will also show information about. | 23:54 |
| paulproteus | It may, unless upstream didn't touch those files. | 23:54 |
| paulproteus | You're best-off committing your local changes, and then doing "git pull" to merge in the other changes. | 23:54 |
| nkinkade | I made changes to the clone on a7, not using git, now I'm going to apply those changes to a my local clone the repository. | 23:54 |
| Bovinity | i've been <3 git fetch ; git merge origin/BRANCH lately. | 23:54 |
| nkinkade | I'm worried that when I got to pull on a7 that I'll get lots of conflicts. | 23:55 |
| paulproteus | Bovinity's saying "git pull" the long way, which is fine. | 23:55 |
| paulproteus | nkinkade, Then you should: | 23:55 |
| nkinkade | Should I just revert the checkout copy. | 23:55 |
| paulproteus | do your commit locally, and then do the merge. | 23:55 |
| paulproteus | And if you get conflicts, you run git mergetool, and you get a nice Emacs-based merge tool, or kdiff3 if you have a GUI. | 23:55 |
| nkinkade | paulproteus: What I'd rather do is revert the file on a7 to where git last had a commit, then commit my local changes, then do a pull on a7. | 23:56 |
| paulproteus | I don't understand. | 23:56 |
| paulproteus | Isn't that what I suggested? | 23:56 |
| nkinkade | Your way will give me conflicts. | 23:57 |
| Bovinity | i think he means some form of git reset | 23:57 |
| nkinkade | I want to undo the changes I made on a7 . | 23:57 |
| paulproteus | git checkout $file | 23:57 |
| nkinkade | But reset will reset the index rigth. | 23:57 |
| nkinkade | Nothing has been added to the index, unless someone else did it. | 23:57 |
| nkinkade | Then I'll redo the changes on local git-ed version, and then commit them and then do a pull on a7. | 23:58 |
| nkinkade | I don't want to pull on a7 and get all sorts of conflicts that I have to resolve, if I can avoid it. | 23:58 |
| * paulproteus nods | 23:59 | |
| paulproteus | nkinkade, Something else you could do is: | 23:59 |
| nkinkade | Ah. | 23:59 |
| paulproteus | cp -a /path/to/place/with/commits/ /tmp/playground | 23:59 |
| nkinkade | Now that makes sense. Cool. | 23:59 |
| paulproteus | cd /tmp/playground | 23:59 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!