| Time |
Nick |
Message |
| 08:42 |
|
mmorgan joined #evergreen |
| 08:52 |
|
jmurray-isl joined #evergreen |
| 09:18 |
|
Dyrcona joined #evergreen |
| 11:10 |
Dyrcona |
Tedium is tedious. |
| 11:11 |
Dyrcona |
Tedeum is tedeus? |
| 11:13 |
Dyrcona |
Whee! 71 patches from 3.15.0, not all of which I need to use right away. |
| 11:16 |
Dyrcona |
I should probably break them up into more patches or at least subject-related patches so that they're easier to deal. I find that squashing everything down into 1 big commit is a bad idea in the long run. Like it would be easier if I split the template changes out from the non-template changes, at least for my current purpose. |
| 11:18 |
Dyrcona |
The first patch is 26MB. Who want to work with that? |
| 11:25 |
Dyrcona |
I am probably better off using git diff on jus the selected file/directories that I want. |
| 11:25 |
Dyrcona |
Hey! Left hand! The S key is right there. |
| 11:27 |
Dyrcona |
The entire patch series adds up to about 36MB according to du. |
| 11:35 |
Dyrcona |
apparmor-- |
| 11:36 |
jeffdavis |
My internal monologue sounds like the above, but with a lot more swearing at computers. |
| 11:36 |
Dyrcona |
jeffdavis++ |
| 11:37 |
Dyrcona |
I usually swear that the programmers and admins... :) |
| 11:37 |
Dyrcona |
s/that/at/ |
| 11:37 |
Dyrcona |
And my own fingers. :) |
| 11:39 |
Dyrcona |
I'm going to get a lit of changed files from git diff, and then just get the patches for the files that I need for the 2 branches that I have to make. Some of my later commits delete stuff we added, so I don't need those at all..... |
| 11:40 |
Dyrcona |
I should script this in a way that I can reuse it later, instead of reinventing it every time I have to make a new branch for the dev server or for production. |
| 11:43 |
Dyrcona |
Some of this would not be necessary if we did not use custom template directories. |
| 11:44 |
Dyrcona |
Or, if I kept my changes in the custom template directories in my custom branches. That makes other things more difficult, so it is a trade off. |
| 11:44 |
Dyrcona |
Right. I'll shut up and get back to actual work. |
| 11:47 |
|
jihpringle joined #evergreen |
| 11:50 |
Dyrcona |
The --reverse option on git log proves useful in this case. I also use it a lot when cherry-picking from other branches. |
| 12:09 |
|
mmorgan1 joined #evergreen |
| 12:42 |
|
jihpringle joined #evergreen |
| 14:03 |
mmorgan |
@decide permissions or persimmons |
| 14:03 |
pinesol |
mmorgan: go with permissions |
| 14:04 |
mmorgan |
Hm. I think I'd prefer persimmons. |
| 14:29 |
Dyrcona |
heh |
| 15:07 |
|
jihpringle joined #evergreen |
| 16:04 |
Dyrcona |
All right so after all of that, I got the 3.15.0 templates and customized templates updated in the second repo. |
| 16:04 |
Dyrcona |
I have more files to patch but that's not bad for a couple of hours work. |
| 16:07 |
Dyrcona |
I swear that I installed updates on that machine yesterday and it tells me there are 14 more today. |
| 16:08 |
Dyrcona |
New kernel. Guess I'll upgrade and reboot. |
| 16:59 |
|
mmorgan left #evergreen |
| 18:20 |
|
jihpringle joined #evergreen |
