| Time |
Nick |
Message |
| 06:59 |
|
collum joined #evergreen |
| 08:22 |
|
Dyrcona joined #evergreen |
| 08:44 |
Dyrcona |
Oof... Merge conflicts. |
| 09:06 |
Dyrcona |
I keep getting the same conflicts in the same files using git cherry-pick. I think merge would take care of it in one go. |
| 09:09 |
Dyrcona |
And, it looks like one branch removes code that the other branch added. Perhaps it is adding it back because removing it was a mistake? IDK. I have to punt. |
| 09:12 |
Dyrcona |
Maybe I'll try an actual rebase. I didn't because I screwed up my option order when setting up the worktree. |
| 09:17 |
Dyrcona |
Ah, no. I think it is going to go through all of the same conflicts as it applies each commit. I'm gonna abort and try a merge to see if my hunch is correct. |
| 09:17 |
Dyrcona |
Yeahp, git merge throws all of the conflicts up at once. It's much less tedious. |
| 09:18 |
Dyrcona |
merge++ patch-- |
| 09:19 |
Dyrcona |
Think I'll attempt to resolve the conflicts in the merge branch as an exercise. |
| 09:20 |
|
mmorgan joined #evergreen |
| 09:22 |
Dyrcona |
Ok. This one conflict doesn't make sense. The file does not appear to have changed since the new changes were made. Maybe if I merge in the other direction, i.e. merge feature branch to main? |
| 09:27 |
Dyrcona |
Nope. Same conflicts. |
| 09:33 |
|
Rogan joined #evergreen |
| 10:28 |
Dyrcona |
oops. Guess I should have done those two in 1 branch... |
| 10:29 |
Dyrcona |
Well, I haven' pull requested it, yet. |
| 10:49 |
|
smayo joined #evergreen |
| 10:51 |
* Dyrcona |
uses this opportunity to test main on Debian 13 with OpenSRF rel_3_3 because this combo should work for Evergreen 3.17. |
| 11:59 |
|
Christineb joined #evergreen |
| 12:19 |
Dyrcona |
*sigh* |
| 12:19 |
Dyrcona |
Typos-- |
| 12:25 |
Bmagic |
Dyrcona++ |
| 12:26 |
Bmagic |
# being human |
| 12:35 |
Dyrcona |
That was a good movie as I recall. |
| 12:40 |
* Dyrcona |
tries to remember if he made a bug about installing the PostgreSQL community deb repos... I don't think I did. There's a better way to do it than what we do right now. |
| 12:48 |
Dyrcona |
I always forget to install rsync on my Debian vms. |
| 12:49 |
Dyrcona |
Until after I try to use it and it fails. |
| 12:51 |
jeff |
I often forgot to install useful packages on my virtual machines. And then I discovered, ANSIBLE! Ansible, from the creator of COBBLER, lets you ... [click] |
| 12:51 |
* jeff |
changes the channel |
| 12:51 |
Dyrcona |
heh. |
| 13:09 |
|
jmurray-isl joined #evergreen |
| 13:21 |
|
jihpringle joined #evergreen |
| 14:57 |
|
mantis1 joined #evergreen |
| 14:59 |
mantis1 |
sorry that I keep coming back with more questions on 3.15 |
| 14:59 |
mantis1 |
did anyone notice that monthly recurring reports that were set up are not working because the filter is by MM-YYYY instead of MM-DD-YYYY? |
| 15:10 |
jihpringle |
mantis1: we haven't encountered that (as far as we're aware) in 3.14 but we did run into this with monthly reports and angular - https://bugs.launchpad.net/evergreen/+bug/2095596 |
| 15:10 |
pinesol |
Launchpad bug 2095596 in Evergreen "Angular Reporter: Month date filter is missing the calendar widget" [Medium,Confirmed] |
| 15:10 |
mantis1 |
jihpringle++ |
| 15:17 |
mantis1 |
do you receive any output though? |
| 15:33 |
|
mantis1 left #evergreen |
| 15:55 |
Dyrcona |
Grr... livecheck failures on Debian 13 with the Angular 21 branch which should not affect it. Bet if I try again, they'll just work.... :( |
| 16:31 |
|
jihpringle joined #evergreen |
| 16:33 |
jihpringle |
mantis1: it's hard to tell - after we upgraded in April we basically told libraries if a report stopped working to clone the new template and set up a new recurring report (sorry got disconnected over lunch) |
| 17:01 |
|
mmorgan left #evergreen |
| 18:19 |
|
jihpringle joined #evergreen |
