| Time |
Nick |
Message |
| 00:36 |
|
jaswinder joined #evergreen |
| 00:43 |
|
jaswinder joined #evergreen |
| 00:52 |
|
beanjammin joined #evergreen |
| 02:18 |
|
jaswinder joined #evergreen |
| 06:31 |
pinesol_green |
News from qatests: Testing Success <http://testing.evergreen-ils.org/~live> |
| 07:17 |
|
agoben joined #evergreen |
| 07:41 |
|
rjackson_isl joined #evergreen |
| 08:16 |
|
_bott_ joined #evergreen |
| 08:46 |
|
stephengwills joined #evergreen |
| 08:48 |
|
mmorgan joined #evergreen |
| 09:01 |
|
Dyrcona joined #evergreen |
| 09:03 |
|
ngf42 joined #evergreen |
| 09:07 |
|
jvwoolf joined #evergreen |
| 09:15 |
|
jvwoolf1 joined #evergreen |
| 09:19 |
|
jaswinder joined #evergreen |
| 09:21 |
|
yboston joined #evergreen |
| 09:23 |
|
jaswinder joined #evergreen |
| 09:43 |
pinesol_green |
[evergreen|Dan Wells] Forward-port 3.1.1 upgrade script - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=2b7742a> |
| 09:51 |
pinesol_green |
[evergreen|Dan Wells] Forward-port 3.0.7 upgrade script - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=3a3cbc9> |
| 09:59 |
Dyrcona |
dbwells++ |
| 09:59 |
csharp |
dbwells++ |
| 10:03 |
dbwells |
csharp++ |
| 10:06 |
|
Christineb joined #evergreen |
| 10:10 |
|
littlet joined #evergreen |
| 10:24 |
|
jihpringle joined #evergreen |
| 11:18 |
|
yboston joined #evergreen |
| 11:55 |
|
beanjammin joined #evergreen |
| 12:17 |
|
afterl joined #evergreen |
| 12:25 |
|
khuckins joined #evergreen |
| 13:04 |
gmcharlt |
https://evergreen-ils.org/evergreen-3-1-1-and-3-0-7-released/ |
| 13:07 |
* dbs |
tries, comically, to run a "git merge" of rel_3_1 against his very-long-lived custom branch (and vice versa) |
| 13:07 |
dbs |
le sigh |
| 13:07 |
Dyrcona |
dbs: git pull --rebase or just git rebase. |
| 13:08 |
* Dyrcona |
finds that when merge barfs, rebase often works, and vice versa. :) |
| 13:08 |
Dyrcona |
But conflicts are a way of life with any VCS. |
| 13:08 |
dbs |
Dyrcona: yeah, started the "git rebase upstream/rel_3_1" route but I'm having to step through around 1000 commits |
| 13:09 |
Dyrcona |
dbs: rebase -i and squash a bunch of the commits. |
| 13:09 |
dbs |
things like "docs/root.txt" -> "docs/root.adoc" but the commits still trying to modify docs/root.txt |
| 13:09 |
Dyrcona |
Somehow, 13 seems to be the magic number for commits that I squash into one. I have two commits in two different branches that start out "Squashed 13 commits into 1" |
| 13:10 |
Dyrcona |
dbs: I think there's a trick to handle that, actually. |
| 13:10 |
* Dyrcona |
checks with git --help |
| 13:10 |
dbs |
I suspect a lot of this is a result of my having frequently cherry-picked fixes into my branch before they were signed off |
| 13:11 |
Dyrcona |
Meh, find-renames is supposed to be on by default. |
| 13:12 |
Dyrcona |
Yeah, cherry-pick will do that. |
| 13:12 |
* Dyrcona |
seems to recall having that discussion before. ;) |
| 13:13 |
dbs |
heh |
| 13:14 |
|
yboston joined #evergreen |
| 13:15 |
dbs |
looks like "--merge" might help, at least it's giving more explicit errors |
| 13:16 |
Dyrcona |
I've had luck using strategy theirs or ours, depending on my aim, but with lots of commits, you may end losing code. |
| 13:18 |
Dyrcona |
Actually, right now is a great time to rebase branches since releases just happened and git was just updated. |
| 13:19 |
Dyrcona |
Think I'll do that since I have a few minutes to spare at the moment. |
| 13:22 |
|
jaswinder joined #evergreen |
| 13:22 |
|
jaswinder joined #evergreen |
| 13:46 |
|
alynn26 left #evergreen |
| 14:03 |
|
khuckins joined #evergreen |
| 15:02 |
|
mmorgan1 joined #evergreen |
| 15:25 |
|
terran joined #evergreen |
| 15:48 |
terran |
Is anyone logged in right now using the supercat new book feeds? |
| 15:54 |
|
book` joined #evergreen |
| 16:07 |
|
khuckins joined #evergreen |
| 16:27 |
|
mmorgan joined #evergreen |
| 16:31 |
jeff |
Is anyone here running 3.0 or 3.1 on stretch? I'm looking for confirmation of a bug. :-) |
| 16:42 |
jihpringle |
jeff: we're running 3.1 test servers |
| 16:42 |
jihpringle |
what's the bug? |
| 16:45 |
jeff |
variation of what Bmagic ran into earlier this week. Symptom would be that e-mail notifications fail. |
| 16:45 |
jeff |
jihpringle: have you tested generating email notifications from 3.1 on Debian 9 (stretch)? |
| 16:50 |
jihpringle |
I've seen check out receipts in 3.0 and 3.1 but we haven't done much email testing yet |
| 16:51 |
jihpringle |
I'm testing with a hold slip now |
| 16:53 |
jihpringle |
we're running 3.1 on Ubuntu 16.04 |
| 16:54 |
|
afterl left #evergreen |
| 16:54 |
jeff |
okay, then you would likely not be affected. |
| 16:55 |
jihpringle |
good to know, good luck testing |
| 17:09 |
|
mmorgan left #evergreen |
| 18:32 |
pinesol_green |
News from qatests: Testing Success <http://testing.evergreen-ils.org/~live> |
