| *** isforinsects has quit IRC | 00:08 | |
| *** isforinsects has joined #cc | 00:09 | |
| *** stevel has quit IRC | 00:35 | |
| *** nathany has joined #cc | 01:16 | |
| nathany | paulproteus: SYN | 01:17 |
|---|---|---|
| paulproteus | nathany, ACK | 01:17 |
| nathany | paulproteus: is it possible to use git-svn to pull in upstream sources as a sub-directory of your project, tracking your own changes? | 01:17 |
| paulproteus | "as a sub-directory of your project" + "tracking your own changes" | 01:18 |
| paulproteus | Part 1 is "easily done" using git submodules. | 01:18 |
| nathany | right | 01:18 |
| nathany | i guess part 2 is as well? | 01:18 |
| paulproteus | "Tracking your own changes" - well, you could have a git repo that is an automatically-updated from svn. | 01:18 |
| nathany | (just pointing your submodule to a specific branch?) | 01:18 |
| paulproteus | I mean, the way I think of this is: | 01:18 |
| paulproteus | 1. You set up a daemon somewhere to git-svn slurp | 01:19 |
| paulproteus | 2. You create some changes on a separate branch | 01:19 |
| paulproteus | 3. Nightly you update the git-svn branch, and | 01:19 |
| paulproteus | 4. Nightly you merge the latest git-svn stuff into your branch. | 01:19 |
| paulproteus | If that merge succeeds, great, push. | 01:19 |
| paulproteus | If not, email the sorry guy that he needs to take a look at why not. | 01:20 |
| nathany | got it | 01:20 |
| nathany | ok, that makes sense | 01:20 |
| nathany | not sure i'll have to go down that path, but it does help clarify what that path looks like | 01:20 |
| paulproteus | I have something like that set up for Lyceum (which is probably abandoned upstream, sadly), all automated, but it has the extra step of rewriting history to change the path layout of the svn repository every night. | 01:21 |
| paulproteus | git filter-branch, that's what it's called. | 01:21 |
| nathany | ah, ok | 01:21 |
| nathany | so i'm having to learn some basic Maven (which is like buildout on steroids for java) | 01:21 |
| paulproteus | buildout on (steroids for Java) is an interesting idea. | 01:21 |
| nathany | but i think i may be able to suck in the dependency a different way (not necessarily better or worse... just... different) | 01:22 |
| nathany | yeah, it's a little insane -- XML + convention over configuration | 01:22 |
| * paulproteus nods | 01:22 | |
| *** nathany has quit IRC | 01:31 | |
| *** Bovinity has quit IRC | 02:04 | |
| *** mlinksva has quit IRC | 02:24 | |
| *** tim_hwang has quit IRC | 03:55 | |
| *** isforinsects has quit IRC | 04:13 | |
| *** tim_hwang has joined #cc | 04:39 | |
| *** isforinsects has joined #cc | 04:41 | |
| *** rejon has joined #cc | 05:27 | |
| *** rejon has left #cc | 05:27 | |
| *** tim_hwang has quit IRC | 05:31 | |
| *** pmiller has joined #cc | 06:38 | |
| *** pmiller has left #cc | 06:38 | |
| *** sama has joined #cc | 07:19 | |
| *** balor has joined #cc | 07:43 | |
| *** balor has quit IRC | 09:34 | |
| *** sama has quit IRC | 12:03 | |
| *** tvol has joined #CC | 13:05 | |
| *** tvol has quit IRC | 13:34 | |
| *** tvol has joined #CC | 13:37 | |
| *** [mharrison] has quit IRC | 13:41 | |
| *** nkinkade has joined #cc | 14:14 | |
| *** rohitj has quit IRC | 14:16 | |
| *** Steren has joined #cc | 14:27 | |
| Steren | hi! | 14:27 |
| *** tvol has quit IRC | 14:37 | |
| *** mlinksva has joined #cc | 14:42 | |
| *** tvol has joined #CC | 14:43 | |
| paulproteus | Hi Steren! | 14:46 |
| *** Steren has quit IRC | 15:04 | |
| *** nathany has joined #cc | 15:11 | |
| nathany | nkinkade: morning | 15:11 |
| *** stevel has joined #cc | 15:12 | |
| nkinkade | nathany: Good morning. | 15:12 |
| nathany | quick civicrm question -- | 15:12 |
| nathany | do you know what script handles the IPN callbacks from PayPal? | 15:12 |
| nkinkade | There are several. I'll list them here: | 15:13 |
| nathany | i can also tell you why i'm interested | 15:15 |
| nathany | two reasons | 15:15 |
| nkinkade | ./sites/default/modules/civicrm/CRM/Core/Payment/PayPalIPN.php | 15:15 |
| nathany | 1) i recall that when you make a contribution you give CC your name, etc, and then head off to paypal | 15:15 |
| nkinkade | ./sites/default/modules/civicrm/CRM/Core/Payment/BaseIPN.php | 15:15 |
| nathany | at that point you can log in with any paypal account, and we never get the name you contributed with back (ie, the name on your account/credit card) | 15:16 |
| nathany | that's a problem since we're claiming that the fact we've completed a transaction gives us more certainty about your identity | 15:16 |
| nkinkade | nathany: I did notice something the other day. The name on the confirmation changed to the one at PayPal, not the one I entered when I first started the donation process in CiviCRM. | 15:17 |
| nathany | 2) do you know if civicrm currently does any tracking of recurring contributions beyond receiving the individual monthly pingbacks from paypal? | 15:17 |
| nathany | nkinkade: oh, that could be good | 15:17 |
| nathany | nkinkade: that's the name we need to get out for our invitation script | 15:17 |
| nkinkade | I didn't go so far as to check whether the actual contribution was altered, but certainly the confirmation was altered. | 15:17 |
| nkinkade | Ah, we'll let me check on that. There should be some test contribution in zupport. | 15:18 |
| nathany | thanks | 15:18 |
| nkinkade | I'll let you know in a couple minutes ... | 15:18 |
| nkinkade | But those two scripts above are the principal 2 that govern PayPal IPN handling. | 15:18 |
| nathany | no problem -- i have a couple other bugs to work on, these are just both semi-large problems for the integration story | 15:18 |
| nathany | (sigh) | 15:18 |
| nathany | thanks :) | 15:18 |
| nkinkade | By the way, I've got Skype all working nicely, so if you ever feel the need to chat at greater length, just let me know. | 15:19 |
| nathany | ok, i should get it on my laptop, too | 15:20 |
| nathany | i'm going to get an i18n bug fixed and then let's plan to chat and just generally sync up | 15:21 |
| nathany | i've dropped the ball on that | 15:21 |
| nkinkade | Sounds good. | 15:21 |
| *** tvol_ has joined #CC | 15:37 | |
| *** tvol has quit IRC | 15:37 | |
| nathany | nkinkade: ping | 15:59 |
| nkinkade | nathany: Here. | 15:59 |
| nathany | wanna chat quick? | 15:59 |
| nkinkade | Yeah. Let me fire up Skype. | 15:59 |
| nathany | i don't have skype installed (but can)... ekiga? | 15:59 |
| nathany | oh ok | 15:59 |
| nathany | one second | 15:59 |
| nkinkade | nathany: Yeah, let's use Ekiga. | 15:59 |
| nkinkade | (or try) | 15:59 |
| nathany | one sec, let me make sure i have it configured for my h3eadset | 16:00 |
| nathany | i'm ready when you are | 16:01 |
| nkinkade | I seem to be having a slight problem with Ekiga the past couple weeks. It doesn't want to register to ekiga.net. | 16:01 |
| nathany | ah | 16:01 |
| nathany | i'll download skype in the meantime | 16:01 |
| nkinkade | Does Ekiga tell you that you are registered okay? | 16:01 |
| nathany | where does it say that? | 16:01 |
| nkinkade | Are you nyergler@ekiga.net? | 16:02 |
| nathany | yes | 16:02 |
| nathany | oh weird | 16:02 |
| nkinkade | Okay it worked. | 16:02 |
| paulproteus | "1 accounts registered" | 16:02 |
| nathany | it rang but then said an aduio error occured | 16:02 |
| nathany | one second... | 16:02 |
| paulproteus | Something like that is what to look for in Ekiga 2.x. | 16:02 |
| nkinkade | But it's not using the headset | 16:02 |
| nkinkade | I can see your video. | 16:02 |
| nkinkade | You've got on a beige shirt? | 16:02 |
| nathany | year | 16:03 |
| nkinkade | Let me double check my audio settings. | 16:03 |
| nkinkade | I can hear you, but through the external speakers. | 16:03 |
| paulproteus | Feel free to ring 2@supercore.laroia.net; that's a VoIP phone here at home for me. | 16:03 |
| paulproteus | (Yay federated Internet!) | 16:03 |
| nathany | nkinkade: were you saying anything? i couldn't hear you if you were | 16:03 |
| nkinkade | I was saying a few things. | 16:04 |
| nkinkade | I could both see and hear you ... I think I've not got it configured right. Once sec. | 16:04 |
| nathany | ok | 16:04 |
| nathany | i may have to do something really janky -- like use the mic from my usb headset with different headphones | 16:04 |
| nkinkade | Did you see your headset in Audio devices section? | 16:05 |
| nkinkade | I had to click "Detect devices" and it found my Logitech USB headset, which I think is the same as yours. | 16:05 |
| nathany | yes | 16:05 |
| nathany | after i cliked detect | 16:05 |
| nkinkade | Let me get my camera while we're at it. | 16:05 |
| nathany | but when i received the call it said it couldn't open a channel. | 16:05 |
| nathany | hrm, wonder if this is the weird pulse audio + flash thing | 16:06 |
| nathany | one second | 16:06 |
| nathany | ok, i'm ready to try again | 16:07 |
| paulproteus | ...hi nkinkade. | 16:07 |
| nkinkade | Hi paulproteus | 16:08 |
| paulproteus | You're typing but not sayin' anything. | 16:08 |
| nkinkade | I think my mixer settings are whacked. | 16:08 |
| nathany | nkinkade: i'm installing skype now | 16:09 |
| nathany | nkinkade: i have skype up and going | 16:12 |
| nathany | i'm nathanyergler there | 16:12 |
| nkinkade | Okay. Let me add you as a contact. | 16:12 |
| nkinkade | I'm actually chatting with Asheesh using Ekiga. | 16:13 |
| nkinkade | Let me disconnect with paulproteus. | 16:13 |
| nathany | heh | 16:13 |
| * paulproteus frowns. | 16:13 | |
| nathany | i can try that as well.. it just freaked on my audio conf | 16:14 |
| paulproteus | Aren't the office phones SIP? | 16:14 |
| paulproteus | "Obviously" we should just skip the phone network and patch nkinkade right into the office phone network. | 16:15 |
| paulproteus | Heck, we could just give him his old extension. | 16:15 |
| paulproteus | Ekiga is his new desk phone. | 16:15 |
| paulproteus | BTW, I find our IP Office thing keeps resetting my voicemail password. | 16:16 |
| paulproteus | I should just redirect that to my own Asterisk voicemail or something. | 16:17 |
| greg-g | good choice/window 5 | 16:17 |
| greg-g | grah | 16:17 |
| * greg-g Mac terminal blows | 16:17 | |
| paulproteus | nathany, Speaking of Mac, can I borrow your Mac Mini for the weekend for doing video streaming at the conference? | 16:18 |
| paulproteus | (The one sitting at the office.) | 16:18 |
| paulproteus | (I'm taking that as a yes unless you say otherwise.) | 16:23 |
| *** Bovinity has joined #cc | 16:33 | |
| nathany | paulproteus: it's CC's, that's fine | 16:51 |
| nathany | nkinkade: with respect to students, can you create a new contribution page on both zupport and support for that? | 16:51 |
| nathany | and then send Bovinity the URL/id to use for the join page | 16:52 |
| nkinkade | nathany: Yup. | 16:52 |
| nathany | thanks | 16:52 |
| paulproteus | nathany, Okay re: CC's | 16:53 |
| paulproteus | I wonder if we still have an Ubuntu CD somewhere useful in the office. | 16:53 |
| paulproteus | I probably have one on my desk, unlabeled. | 16:54 |
| nathany | paulproteus: is there a more advanced mixer for pulse audio than the default gnome one? | 17:01 |
| paulproteus | pavucontrol | 17:03 |
| paulproteus | That's the seriously powerful PulseAudio Volume Control. | 17:03 |
| greg-g | nkinkade: can you give me admin rights on our sourceforge project? | 17:07 |
| nkinkade | greg-g: Maybe, let me see. | 17:08 |
| * greg-g 's productivity has plummeted after sending in his laptop for repairs | 17:08 | |
| nathany | paulproteus: separate debian package? | 17:09 |
| paulproteus | Yup. | 17:09 |
| nathany | nkinkade: let's make sure we check in this afternoon before you take off for the day | 17:09 |
| nathany | greg-g: if nkinkade can't, i can | 17:09 |
| paulproteus | Called by the binary name, I think. | 17:09 |
| greg-g | nathany: k | 17:09 |
| greg-g | it says nkinkade is an admin, so I assume he can make other admins | 17:10 |
| nkinkade | nathany: Sure. I'll check in with you. | 17:10 |
| nkinkade | greg-g: Now I'm just trying to remember my login at Sourceforge. | 17:10 |
| nathany | nkinkade: i'll be taking of for an hour to 90 min around 1130 for physical therapy, but back after that | 17:10 |
| nathany | heh | 17:10 |
| greg-g | nkinkade: I had the same problem :) | 17:10 |
| nkinkade | greg-g: What rights do you need? There are about 20 diff. levels. "Unix Admin"? | 17:14 |
| greg-g | give me them all! | 17:15 |
| greg-g | ;) | 17:15 |
| nkinkade | Or just check "Project admin?" | 17:15 |
| nkinkade | greg-g: See what you can do now. | 17:15 |
| greg-g | sure, I'm going to be deleting/removing things, so proj admin is probably enough, if not, I'll let you know | 17:15 |
| *** is4 has joined #cc | 17:29 | |
| *** isforinsects has quit IRC | 17:29 | |
| greg-g | nkinkade: there must be a setting somewhere with code.cc that sends the svn updates to cctools-cvs@lists.sourceforge (the sender is webmaster@cc) Could you change the destination email address to cc-commits@lists.ibiblio ? | 17:34 |
| nkinkade | greg-g: I'll look at it. I'm sure it's some sort of post-commit hook, but I haven't configured those before. | 17:35 |
| greg-g | nkinkade: first of all, does what I said make sense? | 17:35 |
| nkinkade | I'm sure paulproteus has a good idea, if he happens to be here right now. | 17:35 |
| nkinkade | greg-g: Yeah, it makes sense. | 17:35 |
| nkinkade | greg-g: I just found it. I'll change it now. | 17:36 |
| greg-g | nkinkade: cool | 17:37 |
| nkinkade | greg-g: Have you verified that the cc-commits list works fine? | 17:38 |
| nkinkade | I just changed the post-commit hook in subversion at code.CC.org to send to cc-commits@lists.ibiblio.org | 17:39 |
| greg-g | cc-commits just received my test message | 17:39 |
| greg-g | nkinkade: btw, for some stupid reason, using "SSH Secure Shell" on XP won't let me get to my IRC windows higher than 9, which means, your PM window :( | 17:40 |
| nkinkade | I guess you could try commiting some trivial change to code.CC.org to see if the hook and cc-commits is working. | 17:40 |
| * greg-g doesn't have write access | 17:40 | |
| nkinkade | Higher than 9 what? | 17:40 |
| greg-g | channel windows | 17:40 |
| * greg-g uses a CLI IRC client | 17:40 | |
| greg-g | so I can see that you replied to me in the PM window, but I can't get to it to see what you said. | 17:41 |
| nkinkade | greg-g: Since you are now an SF admin, if you need to just change the commit hook at SF. | 17:41 |
| greg-g | nkinkade: done | 17:41 |
| nkinkade | Cool, and it should be working for code.CC too. | 17:42 |
| greg-g | awesome | 17:43 |
| greg-g | ty | 17:43 |
| greg-g | do we care about bugs against http://labs.creativecommons.org/demos/dhtmllicense/ ? | 17:53 |
| Bovinity | someone posted bugs for that? | 17:58 |
| nkinkade | greg-g: I was just wondering that. I don't know anything about that project except that it required some slight setup when we consolidated labs and techblog. | 17:58 |
| nkinkade | Was it mlinksva that posted that bug? | 17:58 |
| greg-g | nkinkade: yes | 17:58 |
| *** tim_hwang has joined #cc | 18:00 | |
| *** Thedjatclubrock has quit IRC | 18:04 | |
| greg-g | geez SF's bug tracker interface is a pain. To just close a bug with a "hey we moved, if it is still an issue, go here" message takes 4 clicks. | 18:10 |
| greg-g | and that is using a canned response | 18:10 |
| greg-g | (these are all old, untouched, no response from submitter bugs, btw) | 18:11 |
| greg-g | Bovinity: I'll take it from your response that no, we don't care? | 18:21 |
| Bovinity | greg-g: are there a lot? | 18:22 |
| greg-g | just one | 18:22 |
| Bovinity | i'm pretty sure we don't | 18:22 |
| greg-g | title of bug, just so you can say y/n: dhtml chooser defaults to pt jurisdiction with ie6/7 | 18:23 |
| Bovinity | O_o | 18:23 |
| greg-g | yep, and mlinksva submitted it :) | 18:23 |
| Bovinity | i don't think it's a relevant bug any more | 18:25 |
| greg-g | k | 18:25 |
| mlinksva | i guess we should figure out what to do with dhtmllicense chooser | 18:26 |
| greg-g | yay, now the only bugs on SF are cchost related | 18:26 |
| mlinksva | maybe nothing, ignore for now | 18:26 |
| greg-g | will do | 18:26 |
| mlinksva | so i guess not relevant, as Bovinity says :) | 18:26 |
| Bovinity | nkinkade: i keep getting "Could not find valid Key" errors when I try to create a new Contribution page on zupport | 18:27 |
| Bovinity | backtrace is next to useless | 18:27 |
| *** mecredis has quit IRC | 18:37 | |
| greg-g | heh, sorry about the bug mail noise on cc-devel | 18:41 |
| *** is4 has quit IRC | 18:44 | |
| Bovinity | nkinkade: also happening on support | 18:45 |
| *** cacimar has joined #cc | 18:52 | |
| nkinkade | Bovinity: How are you going about creating contribution pages? | 18:59 |
| Bovinity | nkinkade: i was doing "New Contribution Page" | 18:59 |
| Bovinity | now i'm just doing Copy Contribution Page, and using a premade one. | 18:59 |
| Bovinity | nkinkade: doing it from civicrm/admin/contribute | 19:00 |
| nkinkade | Bovinity: Does it give you the error at the last step? | 19:02 |
| nkinkade | Bovinity: I just created one on zupport without a problem. | 19:05 |
| nkinkade | Another possible way to go about it would be to copy and existing one and then edit it. | 19:06 |
| *** isforinsects has joined #cc | 19:15 | |
| Bovinity | nkinkade: on zupport it would error out at step 4, support was giving me issue at step 1 | 19:19 |
| Bovinity | nkinkade: but yeah, i just copied an existing entry | 19:20 |
| *** cacimar has quit IRC | 19:39 | |
| *** tvol_ has quit IRC | 19:53 | |
| *** [mharrison] has joined #cc | 19:54 | |
| *** tim_hwang has quit IRC | 20:08 | |
| *** [mharrison] has quit IRC | 20:33 | |
| paulproteus | nathany, It seems the Mac Mini wouldn't be fast enough to encode. )-: | 21:18 |
| paulproteus | I wonder if there is a computer with Firewire I can borrow for Saturday's streaming. | 21:18 |
| nathany | nkinkade: for the ask letter apparently the state isn't showing up along with the rest of the address information in the footer | 21:23 |
| nathany | any ideas where to look for problems with that? | 21:23 |
| nkinkade | nathany: Yeah, that on my list of things to fix. | 21:24 |
| nkinkade | I'm not 100% sure where to look. I haven't really investigated it yet. | 21:24 |
| nathany | ok, just making sure it's on your list... | 21:25 |
| nathany | it also seems like the template isn't quite right | 21:25 |
| nkinkade | nathany: In what way? | 21:26 |
| nathany | (i also wonder, looking at the configuration page, if we couldn't just say the city is "San Francisco, CA" to fake it out | 21:26 |
| nathany | since the state is clearly set in the domain information, but everything but the state name shows up in the mailing footer | 21:27 |
| nkinkade | The city is a ajax-ified drop down list. | 21:27 |
| nkinkade | I'm wrong. | 21:27 |
| nkinkade | That's the state and country. Sorry. | 21:27 |
| nathany | right | 21:27 |
| nkinkade | Yeah, we could probably fake it out like that. | 21:27 |
| nathany | it's set correctly... just not showing up (but you're aware of that) | 21:27 |
| nkinkade | I suppose it has something to do with the dropdown lists. | 21:27 |
| nkinkade | I don't know exactly why I say that, but those are the only 2 dropdown and neither are showing up. | 21:28 |
| nkinkade | I suspect a bug in CiviMail. | 21:28 |
| nathany | oh, interesting | 21:28 |
| nathany | yeah | 21:28 |
| nathany | ok, anyway, i guess let's focus on the paypal stuff since we can probably fake this out | 21:28 |
| paulproteus | Bovinity, Does CC or you happen to have an OS X 10.4 disc? | 21:32 |
| Bovinity | paulproteus: i think we have a 10.4 around | 21:32 |
| paulproteus | Coolio. | 21:32 |
| nkinkade | nathany: Do you think we'd be safe to checkin to subversion our entire support site, or should I try to separate drupal and civicrm? | 22:04 |
| nathany | i think it's fine to check it all in together... possibly better to separate them but nothing i'm going to lose sleep over | 22:05 |
| nkinkade | They are fairly well separated in terms of the directory structure, so I may just try to separate them. | 22:06 |
| nkinkade | And then pull in civicrm as an extern. | 22:06 |
| nathany | awesome | 22:06 |
| nkinkade | Or should I put this all in git? | 22:06 |
| nkinkade | ;-) | 22:06 |
| * paulproteus looks around furtively | 22:07 | |
| Bovinity | support2008 in sites/default/themes of zupport is in git already. fyi. | 22:07 |
| paulproteus | I tell you, it was pretty awesome being able to git pull in all those SFC wikis. | 22:07 |
| paulproteus | Instantaneously! | 22:07 |
| paulproteus | Anyway, time to catch a BART back to SF. | 22:08 |
| *** tim_hwang has joined #cc | 22:11 | |
| nkinkade | Bovinity: nathany: Any problems if support get moved and goes down for just a minute. | 22:46 |
| nathany | nkinkade: i suppose that's fine... better now than wednesday AM :) | 22:47 |
| Bovinity | i concur | 22:47 |
| nkinkade | I just put support in git and want to swap out the old install with a git clone. | 22:47 |
| nkinkade | Implicit is that I went with git. | 22:47 |
| nkinkade | Alright, that didn't work so well, so I'm going to do that with zupport instead. | 22:52 |
| nkinkade | nathany: Bovinity: Have either of you made any changes to the zupport code? | 22:53 |
| nathany | nkinkade: i have not | 22:53 |
| Bovinity | nope | 22:53 |
| nkinkade | I ask because the git repository is a clone of the existing live site. | 22:54 |
| nkinkade | Now I'm going to replace zupport with this clone. | 22:54 |
| nkinkade | Database data will remain consistent, of course. | 22:54 |
| nkinkade | Bovinity: Can zupport be down for as long as it takes me to get the thing into the git repository? | 22:54 |
| Bovinity | nkinkade: let me check if mellissa is still workong in anything | 22:55 |
| Bovinity | nkinkade: go ahead | 22:55 |
| nkinkade | Okay, hopefully it'll just be a few minutes. | 22:56 |
| nkinkade | But who knows. | 22:56 |
| nkinkade | Bovinity: Do you know enough about git to be able to help me get 2 remote branches and then track them locally? | 23:02 |
| Bovinity | nkinkade: perhaps, if i'm understanding you | 23:03 |
| Bovinity | if you mean git submodules, i'm not so sure | 23:03 |
| nkinkade | Bovinity: Not submodules, but just 2 remote branches that can be tracked locally. | 23:04 |
| Bovinity | git checkout --track -b branch-name (if origin/branch-name already exists) | 23:04 |
| nkinkade | Bovinity: That creates a local branch that tracks a remote branch. | 23:07 |
| nkinkade | Oh wait, the -b creates? | 23:07 |
| Bovinity | nkinkade: correct, on both accounts | 23:07 |
| nkinkade | But in this case branch-name doesn't exits. | 23:08 |
| nkinkade | Fuck it. I'm just going to make my changes and let paulproteus deal with this later. | 23:08 |
| Bovinity | or do you want to push a local branch to a remote? | 23:08 |
| nkinkade | I can't waste any more time fucking around with git. | 23:08 |
| nkinkade | I got as far as creating the repository, and that'll be good enough for now. | 23:09 |
| nkinkade | I'll just use diff to figure out what changes I made and then apply them later to the git repository. | 23:09 |
| *** tim_hwang has quit IRC | 23:12 | |
| paulproteus | Heh. | 23:15 |
| paulproteus | Bovinity, I suggest using "git branch" over "git checkout -b" since I think the "git checkout -b" syntax is a confusing re-use of the checkout verb. | 23:16 |
| paulproteus | FWIW | 23:16 |
| Bovinity | paulproteus: ah. is how i laerned it. i thought git branch couldn't create branches. perhaps that's a historic issue. | 23:17 |
| paulproteus | I think it is, yeah. | 23:17 |
| Bovinity | i always thought "git branch" was kinda dumb for that. | 23:17 |
| paulproteus | Hmm, fwiw, git checkout -b != git branch. | 23:17 |
| Bovinity | right | 23:18 |
| * paulproteus reads man git-branch | 23:18 | |
| Bovinity | checkout -b creates the branch | 23:18 |
| paulproteus | Wait, "git checkout -b $arg" == "git branch $arg ; git checkout $arg" | 23:18 |
| paulproteus | That's how I still suggest teaching it. | 23:18 |
| * paulproteus just tried it | 23:18 | |
| Bovinity | see, i prefer typng less. | 23:19 |
| paulproteus | See, if talking to nathany, I prefer to make sense. | 23:19 |
| Bovinity | also less to go wrong by typing $branchname only once | 23:19 |
| paulproteus | Case in point. | 23:19 |
| nkinkade | paulproteus: Maybe you can help me get that sorted out? | 23:23 |
| paulproteus | How can I be of service? | 23:23 |
| paulproteus | I don't quite understand your question. | 23:23 |
| paulproteus | Do you want to create two local branches, both of which track a respectively different remote branch? | 23:24 |
| nkinkade | I created a git repo cc_support.git. | 23:24 |
| paulproteus | I'll clone it now. | 23:24 |
| nkinkade | I basically would like to created two branches ... something like cc_support_live and cc_support_staging, and then use those branches as the respective clones for support and zupport. | 23:25 |
| paulproteus | Oh, okay. | 23:25 |
| paulproteus | Let me write out an imaginary shell transcript. | 23:25 |
| nkinkade | Making local branches seemed easy enough, but then I was lost about how to create remotes ones ... and the I needed to actually get to coding. | 23:26 |
| paulproteus | nkinkade, Oh, I see. Do you already have the local branches? | 23:27 |
| paulproteus | If so, you just push it to remote, like http://wiki.creativecommons.org/Git_phrasebook#Making_a_local_branch_available_as_a_remote_branch | 23:27 |
| nkinkade | I created a local branch called cc_support_live, but that was before I realized what I really wanted to do. | 23:27 |
| nkinkade | Ah, thanks. | 23:28 |
| paulproteus | If that's enough, then great. | 23:28 |
| paulproteus | If not, then ask me for help again. (-: | 23:28 |
| nkinkade | For the moment I'm still going to concentrate on just getting the code working. | 23:28 |
| paulproteus | I can give you a shell transcript with what I would do if you want. | 23:28 |
| nkinkade | That might be enough. | 23:28 |
| paulproteus | Or I can just throw URLs at you. | 23:28 |
| paulproteus | You pick. | 23:28 |
| * paulproteus does #1 anyway | 23:30 | |
| nkinkade | URLs are good. | 23:30 |
| nkinkade | For the moment. I'm going to focus on just getting this working and then worry about git integration later, even though it may cost me a little work later. | 23:31 |
| *** nathany has quit IRC | 23:32 | |
| *** maelcum has joined #cc | 23:35 | |
| *** maelcum has left #cc | 23:35 | |
| paulproteus | nkinkade, Totally untested: http://cc.pastebin.com/m47ea4f37 | 23:39 |
| paulproteus | (bovinity, feel free to sanity-check) | 23:40 |
| nkinkade | Thanks, Asqueesh. | 23:41 |
| nkinkade | I'll refer back to that. | 23:41 |
| * paulproteus giggles. | 23:41 | |
| nkinkade | :-) | 23:41 |
| paulproteus | The "short version"s are available by changing your branch configuration, which you can do with "git config" I think, or by hacking .git/config. | 23:42 |
| paulproteus | I admit that I haven't gotten around to the habit of using those niceties. | 23:42 |
| paulproteus | I just issue "long version" (aka, "explicit") commands. | 23:42 |
| Bovinity | me either, wiht the short configuration. the less-short versions are usually great, so you know what's going on. | 23:43 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!