| Time |
Nick |
Message |
| 02:09 |
|
JBoyer joined #evergreen |
| 02:37 |
|
bshum joined #evergreen |
| 03:36 |
|
eglogbot joined #evergreen |
| 03:36 |
|
Topic for #evergreen is now Welcome to #evergreen (https://evergreen-ils.org). This channel is publicly logged. |
| 03:44 |
|
book` joined #evergreen |
| 07:33 |
|
BDorsey joined #evergreen |
| 07:40 |
|
kworstell-isl joined #evergreen |
| 07:45 |
|
mantis1 joined #evergreen |
| 08:05 |
|
collum joined #evergreen |
| 08:42 |
|
dguarrac joined #evergreen |
| 08:57 |
|
Dyrcona joined #evergreen |
| 09:12 |
|
rfrasur joined #evergreen |
| 09:42 |
|
mmorgan joined #evergreen |
| 11:05 |
csharp_ |
@band add Surly Bassey |
| 11:05 |
pinesol |
csharp_: Band 'Surly Bassey' added to list |
| 11:09 |
|
Christineb joined #evergreen |
| 11:11 |
Dyrcona |
Oof. My egdev branch is kind of a mess. I should fix it. I wasn't going to use override directories, but somehow there they are. |
| 11:16 |
Dyrcona |
Spot checking a few files, it looks the files in the override directories are the same as the one in the regular directories, so I wonder when/how/why I did that? I don't remember doing it deliberately, but maybe it was a test of something that i didn't undo or an accident. |
| 11:17 |
Dyrcona |
I do recall having trouble getting the commands right to copy them to another repo, so perhaps it happened then and I committed the change? |
| 11:25 |
Dyrcona |
Related to Lp 1979348, I'm trying to find where preferred language gets set in patron registration/edit and I'm either blind or having a bad day because I don't see it. Does anyone have any pointers for the code? |
| 11:25 |
pinesol |
Launchpad bug 1979348 in Evergreen "Need ability to pick what displays for Preferred Language" [Undecided,Confirmed] https://launchpad.net/bugs/1979348 |
| 11:31 |
Dyrcona |
Oh, 'cause the fields are named locale, not language....How consistent of us..... |
| 11:34 |
Dyrcona |
Apparently, I added the override directories from the beginning, even had them in the Apace2 configuration.... I don't remember doing that, but git is better than memory. |
| 11:35 |
Dyrcona |
Think I'll sort that out before I continue modifying files. I have to check if they're the same as the main files and if not, decide what to do about it. |
| 11:47 |
Dyrcona |
Well, that was easy. Turns out the override directories and the non-override were mostly the same, and when they weren't the override directories were missing changes, so a couple of rm -rf and a git commit later, it's all cleaned up. |
| 11:47 |
Dyrcona |
I suppose an interactive rebase will change the history and it will be like they were never there in the first place... |
| 11:48 |
Dyrcona |
Yeah..... |
| 11:53 |
Dyrcona |
The previous cherry-pick is now empty, possibly due to conflict resolution. |
| 11:53 |
Dyrcona |
Fun times.... |
| 12:01 |
Dyrcona |
Oh... Rebase did a merge...... That's inconvenient. I've got multiples of the same commit it looks like..... |
| 12:01 |
Dyrcona |
Oh well, lunch time. |
| 12:11 |
Dyrcona |
OIC. The trouble started when I merged another branch into this one to pickup some changes. That's even where the overrides came from. I think a larger rebase will fix it. |
| 12:12 |
Dyrcona |
You mix merges and cherry-picks at your own peril.... (I'll have to add that to the git presentation.) |
| 12:16 |
|
jihpringle joined #evergreen |
| 12:32 |
Dyrcona |
OK. All fixed! |
| 12:42 |
|
collum joined #evergreen |
| 12:53 |
Dyrcona |
I think I'll need to modify that other branch while I'm at it. |
| 12:54 |
Dyrcona |
I'll need to put some things into the override directories. |
| 13:15 |
Dyrcona |
Oof. Work. |
| 13:18 |
Dyrcona |
I have two clean branches at least. |
| 13:25 |
Dyrcona |
Ooh. Looks like an extra commit snuck in there... Guess I'll git add -p and then checkout after commit. |
| 13:26 |
Dyrcona |
Another good example for the presentation.... |
| 13:26 |
Dyrcona |
And, you can't add -p on a new file.... :( |
| 13:57 |
Dyrcona |
Going to reboot the laptop for reasons. |
| 13:58 |
|
Dyrcona joined #evergreen |
| 13:59 |
Dyrcona |
@monologue |
| 13:59 |
pinesol |
Dyrcona: Your current monologue is at least 26 lines long. |
| 14:00 |
Dyrcona |
And, the annoying gtk/gnome glitch is resolved. Some updates require a reboot or logout/login even if they say they don't. |
| 14:01 |
Dyrcona |
Some of my apps had a blinking cursor in the left of the window/textarea where there should not have been one. |
| 14:19 |
Bmagic |
lol |
| 14:30 |
* Dyrcona |
thinks there is more to Bmagic's lol than just a blinking cursor. :) |
| 14:41 |
|
jihpringle joined #evergreen |
| 16:24 |
|
JBoyer joined #evergreen |
| 16:27 |
mmorgan |
Is there a trick to running ng lint that I'm missing? I'm looking at bug 1988321 where sandbergja notes that the branch in comment 1 doesn't pass ng lint, but I don't see a failure. |
| 16:27 |
pinesol |
Launchpad bug 1988321 in Evergreen "cover image uploader generic error even with success" [Undecided,Confirmed] https://launchpad.net/bugs/1988321 |
| 17:03 |
|
mmorgan left #evergreen |
| 18:12 |
|
jihpringle joined #evergreen |
| 22:10 |
|
JBoyer_ joined #evergreen |
