Time |
Nick |
Message |
02:30 |
|
JBoyer joined #evergreen |
04:45 |
|
JBoyer joined #evergreen |
07:55 |
|
BDorsey joined #evergreen |
08:31 |
|
mmorgan joined #evergreen |
08:39 |
|
dguarrac joined #evergreen |
08:43 |
|
JBoyer joined #evergreen |
08:55 |
|
Dyrcona joined #evergreen |
09:06 |
|
kmlussier joined #evergreen |
09:06 |
|
smayo joined #evergreen |
09:06 |
kmlussier |
Good morning #evergreen! |
09:06 |
kmlussier |
@coffee [someone] |
09:06 |
* pinesol |
brews and pours a cup of Kenya, and sends it sliding down the bar to jblyberg7 |
09:07 |
kmlussier |
@tea [someone] |
09:07 |
* pinesol |
brews and pours a pot of Golden Orchid, and sends it sliding down the bar to Bmagic (http://ratetea.com/tea/whispering-pines/golden-orchid/7244/) |
09:07 |
kmlussier |
pinesol seems to pick the same people over and over again. |
09:07 |
pinesol |
kmlussier: Sorry, we can't do that because, you know, SOFTWARE. |
09:16 |
|
mantis1 joined #evergreen |
09:22 |
JBoyer |
^ too real robot, too real. |
10:00 |
Dyrcona |
2 days 1 hour 4 minutes at this point. :) |
10:06 |
Dyrcona |
using 68GB (roughly) of RAM on the DB server for this one long query now. |
10:12 |
Dyrcona |
i should have disable the ingest. The only thing changing in the MARC is the 901. |
10:53 |
|
sandbergja joined #evergreen |
10:56 |
sandbergja |
gmcharlt++ # opensrf releases |
11:02 |
|
briank joined #evergreen |
11:03 |
mmorgan |
gmcharlt++ |
11:45 |
Dyrcona |
On the plus plus side, after I'm done with this bug, the sample data will handle auto-renewasl. |
11:45 |
Dyrcona |
renewals, even.... |
11:58 |
|
jihpringle joined #evergreen |
12:42 |
|
jihpringle joined #evergreen |
13:06 |
mantis1 |
sorry it's been a while since I've done signoffs |
13:06 |
mantis1 |
for this bug, is the commit for the cherry pick command this? https://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=434fb83828358cb695cf69ba83f433718222c15d |
13:06 |
mantis1 |
commit code: |
13:06 |
mantis1 |
434fb83828358cb695cf69ba83f433718222c15d |
13:07 |
Dyrcona |
mantis1: If your git is confirured correctly `git cherry-pick -s 434fb83828358cb695cf69ba83f433718222c15d` |
13:07 |
mantis1 |
hm |
13:08 |
mantis1 |
oh I think I get what I did wrong |
13:08 |
|
jvwoolf joined #evergreen |
13:08 |
Dyrcona |
You might want to do git configure --global user.name "Your Name Here" and git config --global user.email "youhost.tld" |
13:11 |
mantis1 |
remote: error: hook declined to update refs/heads/lp2036296_hours_of_operation_edit_note_check_box_per_line_signoff |
13:12 |
mantis1 |
some merging issue |
13:12 |
mantis1 |
you're supposed to commit before cherry picking, correct? |
13:13 |
Dyrcona |
You need to rename the branch to user/<yourgitname>/lp2036296_hours_of_operation_edit_note_check_box_per_line_signoff and then git push working HEAD |
13:13 |
mantis1 |
ah gotcha |
13:14 |
Dyrcona |
You can rename the branch in the push, but I find it easier to use the same name locally as on the working repo. |
13:14 |
mantis1 |
Dyrcona++ thank you for reminding me |
13:14 |
mantis1 |
would anyone mind if I add a step on committing to these set of instructions? https://wiki.evergreen-ils.org/doku.php?id=newdevs:git:signoff&s[]=signoff |
13:15 |
mantis1 |
I mostly use this whenever I do the signoffs |
13:15 |
Dyrcona |
mantis1++ Documentation updates would be appreciated. |
13:15 |
mantis1 |
sweet i'll add it in |
13:16 |
mantis1 |
Is it best practice to commit before or after running git remote update? |
13:18 |
Dyrcona |
I usually begin every git session with : `git fetch --all` and then a git pull in any remote branches that I have copied locally, such as main, rel_3_12, etc. |
13:19 |
mantis1 |
I do, too |
13:19 |
Dyrcona |
I'll rebase certain working branches if it seems necessary. |
13:23 |
|
Rogan joined #evergreen |
13:25 |
mantis1 |
How's this? |
13:25 |
mantis1 |
https://wiki.evergreen-ils.org/doku.php?id=newdevs:git:signoff#how_to_sign_off_on_a_branch |
13:25 |
mantis1 |
I added git fetch --all instead of git pull in step 3 then added a comment on commit messages in step 5 |
13:28 |
Dyrcona |
You'll still need to do the git pull after git fetch. fetch updates the references, but doesn't pull the code. pull will update the local branch and fetch the 1 remote that is the origin of the currently checked out branch, provided it tracks a remote branch. |
13:29 |
* Dyrcona |
has a meeting. |
13:30 |
mantis1 |
ok I added it! |
13:33 |
Dyrcona |
mantis1++ # It's even more fun when the branch has multiple commits. |
13:34 |
mantis1 |
whewwwww |
13:44 |
pinesol |
News from commits: Updating relator codes for 2.8 <https://git.evergreen-ils.org/?p=Evergreen.git;a=commitdiff;h=51ac6c6b36fd693600e2a6376fede9228a9b992d> |
13:44 |
pinesol |
News from commits: Translation updates - newpot <https://git.evergreen-ils.org/?p=Evergreen.git;a=commitdiff;h=3136a55f70c1126cbdb90fff56f71f9eecec61ee> |
14:24 |
|
jvwoolf joined #evergreen |
14:24 |
|
jvwoolf joined #evergreen |
14:26 |
|
adam_reid joined #evergreen |
14:28 |
|
collum joined #evergreen |
14:29 |
Dyrcona |
"Heard of a van. It's loaded with weapons...." |
14:30 |
Dyrcona |
"This ain't no Mudd Club or CBGB. I ain't got time for that now." |
14:33 |
|
jihpringle joined #evergreen |
14:47 |
berick |
talking heads? |
14:58 |
mantis1 |
talking heads++ |
14:59 |
Dyrcona |
berick: Yes, "Life During Wartime." |
15:04 |
|
redavis joined #evergreen |
15:05 |
csharp_ |
@decide BEGIN; or BEING; |
15:05 |
pinesol |
csharp_: go with BEGIN; |
15:06 |
csharp_ |
ERROR: syntax error at or near "being" |
15:06 |
csharp_ |
never made that particular typo before |
15:07 |
|
redavis joined #evergreen |
15:08 |
berick |
EXISTENCE DOES NOT PARSE |
15:09 |
csharp_ |
@decide BEGIN; or BEIGNET; |
15:09 |
pinesol |
csharp_: go with BEIGNET; |
15:09 |
csharp_ |
pinesol: I will! I WILL! |
15:09 |
pinesol |
csharp_: https://i.imgur.com/m8EySrW.gifv |
15:10 |
csharp_ |
pinesol: kind of looks like Iron & Wine, who I'm listening to currently |
15:10 |
pinesol |
csharp_: What do you mean? An African or European swallow? |
15:10 |
Dyrcona |
I could see that cat being named Beignet. |
15:10 |
berick |
heh |
15:11 |
Dyrcona |
typos-- |
15:12 |
Dyrcona |
My big error today has been forgetting "FROM" after "DELETE." |
15:12 |
berick |
@decide Beignets or Canapés |
15:12 |
pinesol |
berick: go with Canapés |
15:13 |
Dyrcona |
csharp_++ I'll have to investigate Iron & Wine. |
15:15 |
Dyrcona |
Oh, I guess my other mistake was "CASE" after "END" in a values list. Postgres complained about the syntax. |
15:17 |
Dyrcona |
I suppose I should come up with some pgtap tests for the db changes. |
15:20 |
Dyrcona |
Now that I think about it, those two commits might be wrong. The auto_renewal column isn't used to mean auto-renewal is allowed. It means that the renewal was an auto-renewal, doesn't it...... |
15:23 |
mantis1 |
Question on this commit: https://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=fb7e31fd790074a1b62c882913395400223556ad |
15:23 |
mantis1 |
I would like to remove the po files from the commit. What I have been doing is git rm <file> after checking out the working branch locally then saved the commit, but after I pushed, the files remained |
15:24 |
Dyrcona |
After git rm you have to commit. |
15:24 |
Dyrcona |
But, they'll be in the previous commit, still. Do you want to rewrite history as if they were never there? |
15:24 |
mantis1 |
yeah, is that possible? |
15:24 |
mantis1 |
unsure if I need to squash first |
15:26 |
Dyrcona |
it looks like the po files were there before, and you want to get rid of your changes to them? |
15:26 |
mantis1 |
is that possible? |
15:26 |
Dyrcona |
yes, it is possible. |
15:26 |
mantis1 |
-confetti- |
15:28 |
|
jvwoolf left #evergreen |
15:29 |
Dyrcona |
Frist, I'd checkkout a copy of the current branch because you can lose changes if there's a mistake. |
15:30 |
Dyrcona |
frist? first.... :) |
15:30 |
mantis1 |
lol |
15:30 |
mantis1 |
I have a local copy |
15:30 |
Dyrcona |
frist psot. |
15:31 |
Dyrcona |
There are a couple of ways to do it. The safest would be to checkout the previous commit, then checkout the files you want to keep from the commit you referenced and make a new commit. |
15:32 |
Dyrcona |
git checkout 1762a17d803a77a88fa3d2d60e80f68036ccca1c |
15:33 |
Dyrcona |
Then for each file you want to keep: git checkout fb7e31fd790074a1b62c882913395400223556ad -- <filename> |
15:33 |
Dyrcona |
You'll get a message about being in a 'detached HEAD state' that's no big deal and we'll fix that. |
15:33 |
mantis1 |
haven't so far |
15:35 |
Dyrcona |
Did you give it a branch name when you did the first checkout? |
15:35 |
Dyrcona |
Anyway, after you've checked out the two files, what does `git status` say? |
15:36 |
mantis1 |
says new file: |
15:36 |
mantis1 |
filename |
15:36 |
mantis1 |
filename |
15:36 |
mantis1 |
they also come up under untracked |
15:36 |
mantis1 |
oh sorry they don't |
15:36 |
mantis1 |
just changes to be committed |
15:36 |
Dyrcona |
OK, then git commit |
15:37 |
mantis1 |
yup same under the insert message area |
15:37 |
Dyrcona |
checkout stages files for commit now, I think. |
15:37 |
mantis1 |
I did notice when I brought the file up, it reverted to the original |
15:37 |
mantis1 |
which is what I wanted |
15:38 |
mantis1 |
shall I continue checking out the other files under that hash? |
15:38 |
mantis1 |
then when done, submit the commit? |
15:38 |
Dyrcona |
Only the ones that you want to keep. |
15:38 |
mantis1 |
ok |
15:38 |
Dyrcona |
We don't usually submit po file changes because those are handled at release time. |
15:39 |
* Dyrcona |
gets to revert 2 commits in a working branch because of a momentary lapse of reason. |
15:40 |
Dyrcona |
Maybe more of a memory lapse. |
15:41 |
mantis1 |
hmm didn't seem to work when I tried to push |
15:41 |
|
jihpringle joined #evergreen |
15:41 |
mantis1 |
to the remote branch |
15:41 |
Dyrcona |
I suppose I could just rebase and drop them, since main was updated since I started. |
15:41 |
Dyrcona |
mantis1: you changed history, so you'll have to force push to the same branch (if you own it) or push to a new branch. |
15:42 |
mantis1 |
ah I see |
15:47 |
mantis1 |
Dyrcona++ I'll need to look at this again tomorrow but will follow up |
15:47 |
mantis1 |
thank you! |
15:47 |
|
mantis1 left #evergreen |
15:48 |
Dyrcona |
@later mantis1 If it is still giving you trouble, maybe I didn't completely understand what you want to do. |
15:48 |
pinesol |
Dyrcona: Have you run autogen.sh? |
15:49 |
Dyrcona |
@later tell mantis1 If it is still giving you trouble, maybe I didn't completely understand what you want to do. |
15:49 |
pinesol |
Dyrcona: The operation succeeded. |
15:49 |
Dyrcona |
"As we get older...Stop making sense. You won't find her waiting long...." |
15:50 |
Dyrcona |
Talking Heads come around on the shuffle again. |
16:23 |
Dyrcona |
t/regress/lp1773452_copy_state_post_checkin.pg:11: ERROR: null value in column "auto_renewal_remaining" of relation "circulation" violates not-null constraint |
16:23 |
Dyrcona |
Looks like I get to update another test, too. |
16:28 |
Dyrcona |
But, wait! There's more! |
16:32 |
Dyrcona |
I bet I've broken some perl tests, too. I'll have to check those tomorrow. |
16:35 |
Dyrcona |
it's gonna be fun going through the circ and staff client code making sure that the auto_renewal fields actually get a value put into them. I suppose i could cop out and add 'default 0'. |
16:36 |
Dyrcona |
pgtap tests have been updated at least. |
16:38 |
Dyrcona |
Might be strange for me to say this, but we need more tests. |
17:09 |
|
mmorgan left #evergreen |