| # | Time | Nick | Message |
|---|
| # | 01:24:55 | pmpafk has quit IRC |
| # | 01:46:05 | pmpafk has joined #evergreen |
| # | 02:24:48 | pmpafk has quit IRC |
| # | 02:46:56 | pmpafk has joined #evergreen |
| # | 04:31:07 | pmpafk has quit IRC |
| # | 06:27:43 | natschil has joined #evergreen |
| # | 07:04:37 | natschil has quit IRC |
| # | 08:30:45 | eeevil | bshum: re xpath, yes, the attrs should start with @. good catch |
| # | 08:31:38 | tsbere | eeevil: My latest lazy circ look more like you think it should? |
| # | 08:31:52 | eeevil | gmcharlt: when are you locking svn, sir? |
| # | 08:32:42 | eeevil | tsbere: sorry, not nearly enough coffee yet ... you mean the barcode guessing prefix stuff? |
| # | 08:35:02 | tsbere | eeevil: Yea. And last I heard he wants to have it done by 4? Beyond that he didn't provide details. |
| # | 08:35:42 | eeevil | tsbere: yeah, I was going to try to shove in xpath cleanup, but I can just stage that |
| # | 08:36:17 | tsbere | eeevil: bshum aslo said the @ind1 entries are already fixed in trunk? |
| # | 08:37:10 | eeevil | tsbere: I know they were fixed in some places ... just looking into it now |
| # | 08:37:16 | eeevil | dbs did that, IIRC |
| # | 08:37:47 | eeevil | yep: http://svn.open-ils.org/trac/ILS/changeset/19644 and friends |
| # | 08:38:39 | natschil has joined #evergreen |
| # | 08:39:02 | eeevil | in 2.0.3+ |
| # | 09:05:56 | eeevil | tsbere: yes, that's looking great ... some minor nits (spurious data.list.au[0].ws_ou() in get_barcode, very sparse spacing) and one slightly less minor one -- in at least one place we were checking for an ils_event and distinguishing between different values (1002 /* ACTOR_USER_NOT_FOUND */ vs, well, anything else) ... there are permission checks in open-ils.actor.user.retrieve_id_by_barcode_or_username for 1) authenticatedness and 2) VIEW_USER perm, a |
| # | 09:06:09 | eeevil | (that probably got truncated |
| # | 09:09:25 | natschil has quit IRC |
| # | 09:09:37 | eeevil | tsbere: I'll comment on the LP bug |
| # | 09:09:41 | natschil has joined #evergreen |
| # | 09:26:03 | tsbere | eeevil: My list of things to think about possibly doing included "check session and one or more perms". I think I even have notes on that around here somewhere......can get on that fairly quickly. |
| # | 09:26:39 | tsbere | And I know where that spurious data.list.blah was from. Originally grabbed that to a variable, then stopped using it all over the place. |
| # | 09:27:28 | tsbere dislikes the sheer number of iterations that one function went through in trying to get it to work |
| # | 09:30:53 | natschil has quit IRC |
| # | 09:39:21 | gmcharlt | eeevil: will lock SVN at 2 p.m. today, then do the final push |
| # | 09:39:27 | gmcharlt | then git-land for us all |
| # | 09:56:29 | eeevil | gmcharlt: it should be as simple as adjusting the origin repo in my .git/config to point at that instead of the ESI clone, for the master branch, when complete. yes? |
| # | 09:56:43 | gmcharlt | righ |
| # | 09:56:45 | gmcharlt | t |
| # | 10:34:47 | tsbere would like to make it known that some days he hates perl |
| # | 12:14:21 | Digital_Pioneer has joined #evergreen |
| # | 12:25:31 | tsbere | eeevil: Pushed a new commit to the lazy_circ2 branch. Should I bother adding an updated patch to launchpad? |
| # | 12:36:13 | GrandGentil has joined #evergreen |
| # | 12:38:04 | GrandGentil has quit IRC |
| # | 12:38:43 | Digital_Pioneer has quit IRC |
| # | 12:58:44 | gmcharlt | clearing topic branches added yesterday to give us a pristine start |
| # | 13:05:02 | tsbere | I would offer to assist with this, but it appears you have it well in hand for now |
| # | 13:07:16 | gmcharlt | tsbere: if you're looking for something to do, mind giving a hand setting up post-receive hooks to email evergreen and opensrf patches to open-ils-commits? |
| # | 13:08:00 | tsbere | I can give that a shot, though that is one subject I have yet to touch on git (emailing on commit) |
| # | 13:08:16 | tsbere | Also, doesn't opensrf have a different list? |
| # | 13:08:28 | gmcharlt | you're right, it does |
| # | 13:09:04 | gmcharlt | tsbere: preferred login name for shell accounts? |
| # | 13:09:17 | tsbere | tsbere works. |
| # | 13:18:24 | gmcharlt | tsbere: ok, you now have an account on the git server |
| # | 13:18:32 | gmcharlt | your pub key should work |
| # | 13:20:58 | tsbere | Do we want to rig up email in the easiest fashion for later repos, or per repo (which will require more work later)? |
| # | 13:22:34 | gmcharlt | let's assume that people will want email as an option for all repos, even though only Evergreen.git and OpenSRF.git will need it right away |
| # | 13:28:10 | tsbere | Thus, install the email hook via gitolite so it ends up everywhere |
| # | 13:29:31 | gmcharlt | yep; since I believe there's per-repo settings to turn it on or off and set the destination, that sounds dandy |
| # | 13:29:55 | tsbere | Yep. I assume I have some form of sudo rights. |
| # | 13:30:01 | tsbere hasn't tried yet |
| # | 13:30:11 | gmcharlt | you have sudo all |
| # | 13:36:33 | tsbere | Should we clean up the other repos? |
| # | 13:36:46 | tsbere | (the ones without the uppercase first letter) |
| # | 13:37:19 | gmcharlt | yeah, I'll do that now |
| # | 13:38:50 | tsbere | Should I push the email settings now, or should I push to a new branch for merging when we are ready later? |
| # | 13:38:57 | tsbere | (on the gitolite admin repo) |
| # | 13:39:47 | gmcharlt | go ahead and do it now |
| # | 13:40:08 | gmcharlt | you can make a temp repo for yourself to test in the meantime |
| # | 13:41:14 | tsbere | I'll just throw a mailing list entry on testing |
| # | 13:41:30 | gmcharlt | sounds good |
| # | 13:45:04 | tsbere | Is the server set up to do email at all? |
| # | 13:45:29 | tsbere | The errors "nobody to mail" didn't show up, but I also don't see much happening email wise |
| # | 13:45:57 | gmcharlt | no; go ahead and set up your MTA of choice |
| # | 13:46:28 | tsbere | We got any smart host we should be using? |
| # | 13:47:08 | gmcharlt | phasefx ^^ do you know what the new webserver is using? or what penguin used, for that matter? |
| # | 13:47:24 | phasefx | postfix |
| # | 13:47:32 | phasefx | for both |
| # | 13:47:53 | gmcharlt | what smart host, if any? |
| # | 13:48:03 | phasefx | errr, lemme see |
| # | 13:48:55 | phasefx | I don't see mention of a smarthost in /etc/postfix/main.cf |
| # | 13:49:15 | tsbere | Looks like there is an exim piece installed |
| # | 13:49:19 | phasefx | relay host? |
| # | 13:49:40 | tsbere | Relay host sounds like what we may want |
| # | 13:49:46 | phasefx | relayhost = 216.154.195.232 |
| # | 13:49:57 | phasefx | that's the new server, let me compare with penguin |
| # | 13:50:33 | phasefx | same thing |
| # | 13:51:56 | tsbere | Gonna swap out the exim4 for postfix. I know how to configure postfix, and the others are using it. |
| # | 13:52:18 | phasefx likes postfix |
| # | 13:52:26 | gmcharlt | that's fine; exim4 was just what came by default with the VM that csharp created |
| # | 13:52:51 | tsbere | What do we want to label it? git.evergreen-ils.org? |
| # | 13:53:03 | tsbere | Or the default eg-git.georgialibraries.org? |
| # | 13:53:15 | gmcharlt | git.evergreen-ils.org |
| # | 13:53:56 | gmcharlt | in fact, go ahead and teach the box it's git.evergreen-ils.org hostname |
| # | 13:57:08 | tsbere | ok |
| # | 14:00:15 | edoceo has joined #evergreen |
| # | 14:01:59 | gmcharlt | ok, the SVN repos for Evergreen and OpenSRF are now read-only |
| # | 14:02:11 | gmcharlt | them as wants to commit code, please start using Git now |
| # | 14:03:00 | tsbere | Not usually happy to see errors in mail logs. "Recipient address rejected: Service is unavailable; from=<git@git.evergreen-ils.org> to=<tsbere@mvlc.org>" (we greylist) |
| # | 14:08:31 | tsbere | gmcharlt: We may wish to consider setting up the hook to email both of us on gitolite-admin changing |
| # | 14:08:41 | gmcharlt | agreed |
| # | 14:09:09 | tsbere | Alt: Tell it to email whatever list we both end up on anyway |
| # | 14:12:12 | tsbere | I think we need to pick an email prefix, or we will get [GIT] tacked on. But the commits mailing lists I think add their own prefix. |
| # | 14:16:03 | gmcharlt | they do; let's let run with the [GIT] prefix for now to make it clear to anybody to reads the commits lists but not open-ils-dev or #evergreen |
| # | 14:16:11 | eeevil | tsbere: no need for a new patch, just mention the branch and the update, methinks |
| # | 14:17:27 | tsbere | eeevil: Was so much in "configuring git" mode I had to think for a moment to realize what you were replying to. Heh. |
| # | 14:18:03 | gmcharlt | well, one could stick the branch and the commit hash in the subject lines of the git emails too ;) |
| # | 14:18:21 | eeevil | :) |
| # | 14:19:12 | tsbere waits for his test message to make it through the greylister here |
| # | 14:19:36 | tsbere | That, and I am waiting for hedwig to try again. |
| # | 14:19:49 | tsbere | No clue what it uses for retry intervals. |
| # | 14:20:15 | tsbere | Who has access to make sure the commit mailing lists accept git@git.evergreen-ils.org as a sender? |
| # | 14:20:37 | gmcharlt | phasefx ^^ |
| # | 14:21:05 | eeevil | that's csharp's |
| # | 14:21:39 | phasefx | looks like I have access too |
| # | 14:23:53 | phasefx | I could create a subscription and set it to nomail.. also seen a way to allow mails from non-subscribed folks to always go through, but only once I see something of theirs in the moderator queue |
| # | 14:24:04 | phasefx | not much of a mailman admin, alas :) |
| # | 14:24:40 | tsbere | phasefx: I can help you there. |
| # | 14:25:11 | tsbere | phasefx: Privacy Options->Sender Filters, List of non-member addresses whose postings should be automatically accepted. |
| # | 14:25:15 | phasefx | found it, privacy options, sender filters |
| # | 14:25:28 | phasefx | List of non-member addresses whose postings should be automatically accepted |
| # | 14:26:16 | tsbere | I would suggest not removing the svn one for the open-ils-commits list, as I think ILS-Contrib is still svn. |
| # | 14:26:37 | phasefx | didn't see any entries there, they may be set up as subscriptions |
| # | 14:26:42 | tsbere | Could be. |
| # | 14:26:53 | tsbere | The list could not reject by default too. >_> |
| # | 14:26:54 | phasefx | it is, nomail |
| # | 14:27:26 | tsbere prefers using the "non-subscriber" config than nomail subscriptions |
| # | 14:27:50 | phasefx | should be good to go for both lists |
| # | 14:28:20 | tsbere | Anyone know what hedwig is set up for on a retry interval? Seems to be taking a while. |
| # | 14:29:54 | tsbere | I suppose if it is going to try after 30 min or so it isn't time yet. |
| # | 14:32:04 | tsbere | Oh, cool, there it is! |
| # | 14:32:20 | tsbere | gmcharlt: Apparently it defaults to [SCM], not [GIT]. Do we want to change it to [GIT]? |
| # | 14:32:35 | gmcharlt | yes |
| # | 14:33:51 | tsbere | Also, do we want full patches? |
| # | 14:33:59 | tsbere | It doesn't default to that, now that I look |
| # | 14:34:06 | gmcharlt | phasefx: (since there's no MX for evergreen-ils.org) could you set up a mail alias to forward mail sent to gitadmin@evergreen-ils.org to me and tseber? |
| # | 14:34:32 | gmcharlt | tsbere: yes to full patches for the sake of consistency |
| # | 14:34:33 | phasefx | sure thing |
| # | 14:36:13 | phasefx | sent a test email |
| # | 14:37:10 | phasefx | bleh, wrong email address :) |
| # | 14:37:18 | gmcharlt | :) |
| # | 14:38:19 | gmcharlt | phasefx: got it |
| # | 14:38:44 | tsbere | phasefx: I have things stuck in greylister, will eventually get them. |
| # | 14:39:19 | tsbere | gmcharlt: Shall I add that to the email config for the gitolite-admin repo while I am in the conf anyway? |
| # | 14:39:44 | gmcharlt | tsbere: please |
| # | 14:40:41 | eeevil waits for svn-remote to trickle in... |
| # | 14:46:42 | gmcharlt | @later tell dbs what shall we do with the bzr mirror on launchpad? |
| # | 14:46:42 | pinesol_green | gmcharlt: The operation succeeded. |
| # | 14:48:25 | tsbere | I think I got things correct for the email stuff. Someone will need to actually commit something, somewhere, to find out, I guess. |
| # | 14:48:33 | gmcharlt | one it |
| # | 14:50:08 | tsbere | Should we add the nice new email as a reference on http://evergreen-ils.org/dokuwiki/doku.php?id=dev:git ? |
| # | 14:50:24 | gmcharlt | yep |
| # | 14:50:40 | tsbere | Shall I, or will you? |
| # | 14:50:47 | gmcharlt | I'm in there now |
| # | 14:51:47 | tsbere | Ok. I just noticed I am not logged in. Hmmm. And I think I left the password at work. |
| # | 14:52:33 | tsbere | Meh. Can deal with that later. |
| # | 14:53:48 | gmcharlt | ok, I've pushed a change; let's see if it comes in |
| # | 14:54:58 | gmcharlt | and it's arrived |
| # | 14:55:01 | gmcharlt | tsbere++ |
| # | 14:57:28 | tsbere | Ahhh, whitespace changes. Great for testing things like this. |
| # | 14:59:38 | tsbere | I should now go alter our "pull from svn" setup to, well, stop pulling from svn. |
| # | 15:01:32 | gmcharlt | moodaepo: bshum: around? |
| # | 15:04:39 | gmcharlt | or phasefx: could you update the downloads page to point the the gitweb links instead of SVN? |
| # | 15:07:05 | tsbere | gmcharlt: I made a change to the admin repo. You should have gotten an email (I did :D) |
| # | 15:07:12 | gmcharlt | yep, I did too |
| # | 15:07:49 | tsbere | I dislike the prefix being right against the rest of the subject. Figured you wouldn't mind. |
| # | 15:09:16 | gmcharlt | not at all |
| # | 15:19:43 | phasefx | gmcharlt: Downloads page updated |
| # | 15:21:00 | gmcharlt | who here is an ohloh admin for Evergreen? |
| # | 15:24:46 | gmcharlt | phasefx: tsbere: will Open-ILS/xul/staff_client/defaults/preferences/prefs.js need to be adjusted (see starting with line 13) |
| # | 15:25:28 | tsbere | gmcharlt: I have to think of a new way to handle auto-version for trunk (master?) in the staff client code too. |
| # | 15:25:45 | tsbere | gmcharlt: And I think there is an about page somewhere using svn info as well |
| # | 15:25:51 | phasefx | yeah |
| # | 15:29:53 | phasefx | gmcharlt: I get a password prompt trying to ssh git@git.esilibrary.com with my batrepo key |
| # | 15:30:22 | phasefx | ah, phasefx user works |
| # | 15:30:49 | phasefx | but I need to use git@ per the Quick start instructions on the wiki? |
| # | 15:30:59 | gmcharlt | yes |
| # | 15:31:13 | gmcharlt | though git@evergreen-ils.org will work better for your purposes than git@git.esilibrary.com ;) |
| # | 15:31:31 | phasefx | indeed :) was using the right one |
| # | 15:33:33 | phasefx | if I want to add another public key, where do I put it on that box? |
| # | 15:33:57 | tsbere | for git@? |
| # | 15:33:58 | gmcharlt | you email it to gitadmin@evergreen-ils.org |
| # | 15:34:09 | phasefx | cool deal |
| # | 15:34:26 | tsbere | me and/or gmcharlt have to add it to the admin repo. One of the few annoyances. |
| # | 15:39:53 | gmcharlt | grabbing phasefx's new key |
| # | 15:41:11 | gmcharlt | and done |
| # | 15:43:45 | tsbere | In addition to the prefs.js, we need to update Open-ILS/xul/staff_client/chrome/content/main/about.html at a min. I am thinking about how to handle the staff client makefile now. |
| # | 15:46:34 | phasefx | btw, gmcharlt++ tsbere++ |
| # | 15:52:23 | bwgkennedy has joined #evergreen |
| # | 15:53:27 | bwgkennedy has left #evergreen |
| # | 15:58:38 | tsbere | phasefx: What do you think of this for an auto-version? 0master.4e00755 |
| # | 15:58:58 | tsbere | After the . changing, obviously |
| # | 15:59:11 | tsbere could also try and make the "master" part of that be the current branch name |
| # | 15:59:32 | gmcharlt | current branch name would be nice |
| # | 15:59:36 | phasefx | I have no strong feelings there. Can Mozilla still do meaningful comparisons with the version check? |
| # | 16:00:25 | phasefx must jet for a bit |
| # | 16:03:32 | tsbere | phasefx: So long as that first piece is "0" I don't see an issue. How often do you auto-update dev build extensions? That is probably the only time it will matter. |
| # | 16:09:46 | tsbere | gmcharlt: Normally I would poke phasefx for this, but he jetted for a bit. Dropped some changes to my installer branch for removing some of the SVN-isms in the staff client Makefile. |
| # | 16:10:11 | tsbere hasn't decided what might be good for the prefs.js file or the about.html file yet |
| # | 16:10:54 | gmcharlt takes a look |
| # | 16:11:22 | tsbere | Oh, I also touched the readme file. Figure we should stop referring to "trunk" when the branch is "master" |
| # | 16:17:06 | gmcharlt | pushed |
| # | 16:17:58 | gmcharlt | and congrats, you're officially the first patch author to have their changed accepted (a) under the new regime and (b) without the committer having to remember to add in the author's name |
| # | 16:18:08 | tsbere | heh |
| # | 16:18:28 | tsbere | git++ |
| # | 16:18:31 | tsbere | gmcharlt++ |
| # | 16:19:48 | tsbere | I may talk to Dyrcona monday about possibly rigging up our repos to push our branches automatically to a MVLC/Evergreen repo. Which I would have to rig up, of course. I figure it is both a good way to learn about more post-receive hook goodness and a decent idea for keeping things we are working on visible. |
| # | 16:20:08 | gmcharlt | yeah |
| # | 16:20:21 | gmcharlt | and probably now's a good time to talk about naming conventions for repos |
| # | 16:20:29 | gmcharlt | I suggest somethign like |
| # | 16:20:32 | tsbere | True. Also, would we want to put a copy of one of the SIPServer repos up? |
| # | 16:20:46 | gmcharlt | evergreen/mvlc/Evergreen.git |
| # | 16:21:18 | gmcharlt | i.e., evergreen (lower case as a cheap way of keeping the "official" repos at the top of the gitweb list), then org/individual, then repo name |
| # | 16:21:36 | gmcharlt | evergreen/mvlc.git would be OK too, I suppose |
| # | 16:21:44 | tsbere | I would be tempted to use "mirror" instead of "evergreen" |
| # | 16:21:49 | gmcharlt | sounds good |
| # | 16:22:01 | tsbere | so mirror/mvlc/Evergreeen.git and mirror/mvlc/OpenSRF.git could live next to each other in the list |
| # | 16:22:05 | tsbere | For example |
| # | 16:22:11 | gmcharlt | yeah, that works for me |
| # | 16:22:41 | gmcharlt | and sipserver counts as a related project, so it would be fair game for git.evergreen-ils.org |
| # | 16:22:44 | tsbere | We have multiple repos, though. Will probably rig it so that the branches are auto-prefixed with tsbere/ and jason/ (or dyrcona/, whichever he picks) |
| # | 16:23:01 | gmcharlt | yeah |
| # | 16:23:13 | gmcharlt | at that point it would be up to the organization to manage their repos and branches as they see fit |
| # | 16:23:51 | tsbere | That also brings up mailing stuff. What would the policy be for mailing list based updates to the secondary repos? |
| # | 16:24:13 | tsbere | And, for repos not mirroring a remote, would we want a different starting folder? |
| # | 16:26:32 | tsbere thinks that there is a lot to think about still |
| # | 16:29:20 | gmcharlt | tsbere: for an active, non-mirror repo, I still like lowercaseproject/organizationorindividiual.git |
| # | 16:29:33 | tsbere | Sounds good |
| # | 16:29:34 | gmcharlt | or lowercaseproject/organization/subjectprojectorindividual.git |
| # | 16:30:09 | gmcharlt | as far as mailing lists - I say if somebody wants their commits to be mailed somewhere, we do it for them |
| # | 16:30:20 | gmcharlt | but reserve open-ils-commits and opensrf-commits just for the official repos |
| # | 16:32:15 | tsbere | ok |
| # | 16:32:21 | tsbere | I figured that would be the general case |
| # | 16:32:47 | gmcharlt | though probably wouldn't hurt to make the requestor send a confimration that the recipient address actually wants the commit messages |
| # | 16:33:03 | tsbere | Preferably, it goes to an opt-in mailing list |
| # | 16:33:11 | gmcharlt | yeah |
| # | 16:34:13 | gmcharlt | and on our end, be ruthless about disabling it if the recipient list starts ending back bounces |
| # | 16:36:07 | tsbere | True. BTW, should I document how to do that via the config file? |
| # | 16:39:04 | gmcharlt | please |
| # | 16:39:25 | gmcharlt | bshum: I'm setting up a repo for the website project for you now |
| # | 16:39:42 | bshum | gmcharlt: Sounds good. |
| # | 16:40:01 | gmcharlt | time to make git-svn do my bidding |
| # | 16:45:12 | bshum | For the documentation page on the website, there's a link called "watch us work" pointing to SVN timeline. What should the new git equivalent be? |
| # | 16:46:48 | bshum | I could see http://git.evergreen-ils.org/?p=Evergreen.git;a=summary being useful in that place. |
| # | 16:47:02 | gmcharlt | bshum: yes |
| # | 16:47:03 | tsbere | gmcharlt: I added the basic docs to the top of the conf file. I figured they should be prominent. |
| # | 16:47:03 | bshum | Or there's a trac looking at the git stuff too |
| # | 16:47:07 | gmcharlt | gitweb can also generate RSS feeds |
| # | 16:47:14 | gmcharlt | tsbere++ |
| # | 16:47:18 | gmcharlt | and bshum: http://git.evergreen-ils.org/?p=Evergreen_Website.git;a=summary |
| # | 16:47:36 | tsbere | I also included the naming notes, if you haven't read the email yet |
| # | 16:47:59 | gmcharlt | bshum: I gotta go in the next few minutes, but if you have ten, I can give you a crash course |
| # | 16:48:18 | bshum | gmcharlt: That would be great actually. |
| # | 16:48:25 | bshum | I'm about to try cloning the repo |
| # | 16:48:37 | bshum | Poking at it with my Mac first. |
| # | 16:48:38 | tsbere | Aside from eating shortly I can also help out with git related learning. |
| # | 16:48:43 | gmcharlt | ok; since you're pushing to it, you want to use the following as a clone address |
| # | 16:48:53 | gmcharlt | git@git.evergreen-ils.org:Evergreen_Website.git |
| # | 16:52:03 | bshum | Okay. |
| # | 16:54:47 | gmcharlt | so then, after cloning, you should create a working branch for chance (working in your local repo's copy of the master branch has pitfalls for git newbies) |
| # | 16:54:53 | gmcharlt | git checkout -b working |
| # | 16:55:15 | gmcharlt | and you'll want to make sure git knows your name and email addresses for signoffs |
| # | 16:55:24 | gmcharlt | in the git repo, do |
| # | 16:55:38 | gmcharlt | git config user.name "Your Name" |
| # | 16:55:54 | tsbere | Alternatively, from anywhere, do that, but with --global after config |
| # | 16:55:55 | gmcharlt | gt config user.email "you@example.org" |
| # | 16:56:43 | gmcharlt | yeah, doing it global works well for people who (unlike me) just need one identity for the Git commits and signoffs |
| # | 16:56:48 | bshum | Okay, switched to new branch working |
| # | 16:57:01 | gmcharlt | next step is to make a change |
| # | 16:57:39 | gmcharlt | and once you've made your change |
| # | 16:57:45 | gmcharlt | git commit -a -s |
| # | 16:57:58 | bshum | Okay. |
| # | 16:58:03 | gmcharlt | -a to tell git to commit changes you've made to all of the files it knows about |
| # | 16:58:08 | tsbere | fair warning, if you make a *new* file, you will need to git add <file> |
| # | 16:58:08 | gmcharlt | -s to append your signoff |
| # | 16:58:51 | tsbere often tests VCS systems with adding a dummy temp file |
| # | 16:58:55 | bshum | Hmm, vi for the commit message, fun times. |
| # | 16:59:04 | tsbere | bshum: You can change that. |
| # | 16:59:15 | bshum | tsbere: I definitely prefer nano in command line. |
| # | 16:59:58 | gmcharlt | git config --global core.editor /path/to/nano |
| # | 17:00:15 | tsbere | gmcharlt++ |
| # | 17:00:28 | tsbere was trying to recall the setting name |
| # | 17:01:07 | eeevil | that's one thing that continually frustrates me |
| # | 17:01:19 | eeevil | remembering the config paths |
| # | 17:01:42 | gmcharlt | bshum: so after commiting your change |
| # | 17:02:19 | gmcharlt | you next want to fetch updates (let's assume for the sake of argument that moodaepo has been silently changing something while we've been chatting (and silently breaking into the git server to do that ;) ) |
| # | 17:02:24 | gmcharlt | so, one way is |
| # | 17:02:27 | gmcharlt | git pull origin master |
| # | 17:02:37 | gmcharlt | pull the *master* branch from the origin repository |
| # | 17:03:08 | bshum | Okay. |
| # | 17:03:20 | gmcharlt | now, it should tell you that it's already up to date |
| # | 17:03:20 | bshum | Already up-to-date (which is to be expected) |
| # | 17:03:23 | gmcharlt | so now to push: |
| # | 17:03:28 | gmcharlt | git push origin working:master |
| # | 17:03:46 | gmcharlt | push to the remote named origin from your working branch to the remote's branch named master |
| # | 17:04:07 | gmcharlt | and ... |
| # | 17:04:08 | gmcharlt | bshum++ |
| # | 17:04:31 | gmcharlt | bshum: so how are changes getting propagated to the webserver? |
| # | 17:04:50 | gmcharlt | are you doing that manually, or is there some kind of automatic push out from svn that needs to be changed over to git? |
| # | 17:04:55 | eeevil | gmcharlt: are we leaving the ils-contrib repo alone for now? |
| # | 17:04:59 | bshum | gmcharlt: I'm not sure of all the details, but I got over there to the web server and do svn update to pull down the changes |
| # | 17:05:16 | bshum | So I guess we have to redo how that works over there |
| # | 17:05:23 | gmcharlt | yep |
| # | 17:05:49 | gmcharlt | eeevil: yes; I've asked for SSH keys from ILS-contrib committers, but am also splitting it up a bit |
| # | 17:05:58 | gmcharlt | e.g., the website repo conversation I'm having with bshum right now |
| # | 17:06:43 | eeevil | gmcharlt: ahh, perfect ... keeping history somehow? |
| # | 17:07:00 | gmcharlt | eeevil: yep, git-svn handles that beautifully |
| # | 17:09:37 | bshum | Looks like /var/www/open-ils.org on Lupin is a symlink to /root/svn/ILS-Contrib/evergreen-ils.org/ |
| # | 17:10:27 | gmcharlt | then you'll need to set up a git clone (of git://git.evergreen-ils.org/Evergreen_Website.git) |
| # | 17:10:32 | bshum | Yep. |
| # | 17:10:33 | eeevil | booooo (says the guy what doesn't maintain it) |
| # | 17:10:35 | gmcharlt | change the symlink over |
| # | 17:11:06 | gmcharlt | and add a crontab that does a git pull periodically (if you want to automate it), or just do the git pull manually (if you don't want to automate it) |
| # | 17:12:10 | bshum | Heh |
| # | 17:12:20 | bshum | Guess I should install git on Lupin first :) |
| # | 17:13:17 | tsbere | gmcharlt / bshum: FYI, I usually do git checkout -b name origin/master - That way I can be lazy and just type "git pull". The origin/master is the "Tracking branch" in that case. |
| # | 17:24:13 | bshum | Website changed to use git clone now. |
| # | 17:24:23 | bshum | I'm moving the downloads folder stuff into the place though |
| # | 17:27:19 | gmcharlt turns into a pumpkin |
| # | 17:27:22 | gmcharlt | thanks everybody |
| # | 17:27:24 | bshum | Thanks gmcharlt |
| # | 17:29:24 | tsbere | bshum: If you have other questions, let me know. |
| # | 17:29:42 | bshum | tsbere: Thanks, I'm sure I'll have plenty. Very much the git newbie. |
| # | 17:29:52 | bshum | Well, version control in general really. |
| # | 17:30:47 | tsbere | So was I a few months ago. Now I am co-admining a git server. Isn't that hard to pick up if you use it for something you are dealing with a couple times a week. |
| # | 17:34:05 | bshum | Once you commit something |
| # | 17:34:19 | bshum | Do you have to do anything on the local side? |
| # | 17:37:22 | tsbere | We |
| # | 17:37:24 | tsbere | ... |
| # | 17:37:36 | tsbere | well, if you want someone else to be able to see it you need to push it to somewhere public |
| # | 17:37:45 | bshum | Ah right. |
| # | 17:37:55 | bshum | I think I already did that. |
| # | 17:38:19 | tsbere | You can also make multiple branches locally and then use git merge before pushing, if you want |
| # | 17:39:16 | tsbere | Say you were working on two different changes, each in a branch. You commit them both. You could then git checkout master; git pull origin master; git merge branch1; git merge branch2; git push origin master |
| # | 18:33:44 | tsbere | phasefx / gmcharlt / eeevil / whoever: Missed "Trunk" in windowssetup.nsi. Pushed an update to my installer branch, if anyone wants to merge it. |
| # | 19:02:13 | edoceo has quit IRC |
| # | 19:46:16 | edoceo has joined #evergreen |
| # | 20:48:33 | gmcharlt | tsbere: pushed |
| # | 21:01:53 | tsbere | gmcharlt++ |
| # | 21:03:35 | tsbere updated a few things on the dokuwiki |
| # | 21:03:56 | tsbere | Found that opensrf git was referring to evergreen's, and it said subversion instead of git |
April 10-13