| Time |
Nick |
Message |
| 00:35 |
|
sandbergja joined #evergreen |
| 01:00 |
|
sandbergja joined #evergreen |
| 04:52 |
|
khuckins joined #evergreen |
| 06:00 |
pinesol |
News from qatests: Testing Success <http://testing.evergreen-ils.org/~live> |
| 07:18 |
|
rjackson_isl_hom joined #evergreen |
| 08:03 |
|
collum joined #evergreen |
| 08:10 |
|
mmorgan joined #evergreen |
| 08:25 |
|
alynn26 joined #evergreen |
| 08:34 |
|
rfrasur joined #evergreen |
| 09:11 |
|
Dyrcona joined #evergreen |
| 09:29 |
Dyrcona |
Y'know there's a problem with squashing a bunch of commits into 1 massive commit. It makes it harder to use only some of the changes in a different branch later. I know there are options, but now, one has to use them. |
| 09:53 |
* csharp |
agrees |
| 09:54 |
csharp |
based on a discussion here, we did combine our KPAC customizations into a megacommit, but that was better than the sprawl that was there before |
| 09:55 |
csharp |
the principle I try to work from is thinking of a "feature" (or fix) as a unit |
| 09:58 |
Dyrcona |
csharp: Yes, I try to do that, and then a year or two later, everything gets squashed into 1 megacommit. :) |
| 09:59 |
Dyrcona |
Right now, I'm deciding between making a branch for one of my test VMs with modifications from the production configuration or just use a sed script. I'm leaning toward a branch. |
| 10:01 |
Dyrcona |
What I should probably do at this point is split the configuration changes, i.e. those touching Open-ILS/examples from the custom code, i.e. just about everything else. |
| 10:03 |
Dyrcona |
I used to maintain separate branches for configuration vs. custom templates and code modifications, then it all ended up in one branch, and over time the commits got squashed and squashed again until it all ended up in 1 commit. |
| 10:04 |
csharp |
THERE CAN BE ONLY ONE (commit) |
| 10:04 |
Dyrcona |
Heh! |
| 10:06 |
Dyrcona |
git status |
| 10:06 |
Dyrcona |
HEAD detached at 4d50691b51 |
| 10:06 |
Dyrcona |
:) |
| 10:06 |
pinesol |
Dyrcona: [evergreen|Dan Briem] LP#1900184 Patron password use phone not working - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=4d50691> |
| 10:06 |
csharp |
Dyrcona++ |
| 10:07 |
* csharp |
decides to speak in a bad Scottish brogue for the rest of the day |
| 10:08 |
Dyrcona |
I'll do the same and swing a Katana about in memory of Mr. Connery. |
| 10:09 |
Dyrcona |
Anyway, this figuring out what to do with the git branches gives me something to do on an otherwise boring Friday. |
| 10:10 |
Dyrcona |
I think I will, at least, separate the configuration commits from the code. That will make it easier to manage different branches for training, development, and production. |
| 10:10 |
* csharp |
pours out a shaken, not stirred martini in Sean's honor |
| 10:17 |
Dyrcona |
Whee! The joy of running 5 Pogstresql versions on the same server: 36 updates can be installed immediately. 5 of these are security updates. |
| 10:18 |
Dyrcona |
Most of these are for PostgreSQL. |
| 10:18 |
Dyrcona |
Yeahp. 30 PG packages and 6 non-pg packages. |
| 10:24 |
Dyrcona |
It looks like I could clean up some of these changes, too. |
| 10:27 |
Dyrcona |
Hmm... Should the library images go in the configuration commit, the code commit, or a commit of their own? They used to be in a commit of their own, at least the first time that I squashed the 30 some odd commits into three or four. |
| 10:28 |
|
Cocopuff2018 joined #evergreen |
| 10:30 |
Dyrcona |
I'm also thinking about this a little backward at the moment. I can just checkout all of the files from the custom branch into a new branch and then add the ones that I want and commit them. I don't have to check them out piece by piece and commit piece by piece. |
| 10:33 |
Dyrcona |
Guess, I'm swinging the gitana today.... :) |
| 10:38 |
berick |
Dyrcona+- |
| 10:38 |
Dyrcona |
So, looking at the list of modified and untracked files, after git restore --staged *, I'm thinking four commits: Configuration, Code, OPAC Customization, KPAC Customization, |
| 10:40 |
Dyrcona |
berick++ # It's Friday, and I'm off next week. :) |
| 10:40 |
* csharp |
surveys all the detached HEADs rolling around in Dyrcona's wake |
| 10:41 |
Dyrcona |
No detached HEAD at the moment. |
| 10:42 |
Dyrcona |
git checkout -b cwcustom/master-take-n master; git checkout cwcustom/master -- .; git restore --staged * |
| 10:43 |
Dyrcona |
Cause the second checkout also stages the files to be committed. |
| 10:45 |
Dyrcona |
I seem to go through this every time we prepare for a major upgrade, and I seem to make different decisions every time. Think I'll stick to whatever I decide today and document it for myself and others. |
| 10:46 |
csharp |
yep - I have arguments with my past self constantly around that kind of thing |
| 10:46 |
Dyrcona |
csharp++ # It's Friday, and did I mention that I'm off next week? |
| 10:46 |
csharp |
hope you have a great week off |
| 10:46 |
csharp |
we all need a break :-) |
| 10:46 |
Dyrcona |
Thank you! |
| 10:49 |
Dyrcona |
If we're doing releases next week, I may see if I can help out. |
| 10:49 |
Dyrcona |
I *may* get bored with nothing to all week. |
| 10:56 |
Dyrcona |
FYI: 59 modified files and 620 new files. |
| 10:57 |
Dyrcona |
Most of the new files being images, though we added a template or two and a couple of utility scripts. |
| 10:58 |
Dyrcona |
For the next upgrade, I've dropped our custom template directory and put the changes right in the actual templates. I find it easier to manage that way via git. |
| 10:59 |
Dyrcona |
Custom template directories make a lot of sense if you have more than 1, like for each member, or for academic vs public. |
| 11:03 |
Dyrcona |
Y'know, now would also be a good time to convert our logos from JPEG to PNG. |
| 11:13 |
csharp |
yeah, releases are Wednesday if you're around - if not, no big |
| 11:20 |
Dyrcona |
OK. We'll see how things go. |
| 11:20 |
JBoyer |
Speaking of releases... lp 1904220 is a very simple thing to test |
| 11:20 |
pinesol |
Launchpad bug 1904220 in Evergreen 3.5 "determine_booking_status in OpenILS::Application::Circ::Circulate breaks when changing router names" [Medium,New] https://launchpad.net/bugs/1904220 |
| 11:49 |
Dyrcona |
Also, sed++ imagemagick++ |
| 12:08 |
|
Christineb joined #evergreen |
| 12:24 |
|
jihpringle joined #evergreen |
| 12:42 |
pinesol |
[evergreen|Jason Boyer] LP1904220: Fix Booking Service Check - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=effcfc5> |
| 13:35 |
Dyrcona |
I'm doing something for these big commits that I don't normally do. I'm putting the list of changes to be committed into the commit message. |
| 13:54 |
Dyrcona |
git++ emacs++ |
| 14:12 |
|
khuckins_ joined #evergreen |
| 15:07 |
Dyrcona |
In case anyone cares, I ended up with 5 commits. |
| 16:23 |
Bmagic |
I changed the org types to "can have volumes" to "yes" but after I logout/login it's still greyed out on the volume editor. Do we need to run autogen? |
| 16:30 |
* mmorgan |
would say yes, anytime changes are made to org units. |
| 16:38 |
csharp |
autogen-- |
| 17:37 |
|
mmorgan left #evergreen |
| 17:42 |
Bmagic |
mmorgan++ |
| 17:42 |
Bmagic |
csharp++ |
| 18:01 |
pinesol |
News from qatests: Testing Success <http://testing.evergreen-ils.org/~live> |
| 19:51 |
|
sandbergja joined #evergreen |
| 20:48 |
|
sandbergja joined #evergreen |
| 21:34 |
|
sandbergja joined #evergreen |
| 22:18 |
|
sandbergja joined #evergreen |
| 22:36 |
|
sandbergja joined #evergreen |
| 23:19 |
|
Cocopuff2018 joined #evergreen |
| 23:20 |
|
sandbergja joined #evergreen |
