| Time |
Nick |
Message |
| 04:28 |
|
dexap joined #evergreen |
| 04:32 |
|
sseng joined #evergreen |
| 04:33 |
|
remingtron_ joined #evergreen |
| 04:34 |
|
jcamins joined #evergreen |
| 04:34 |
|
dconnor_ joined #evergreen |
| 04:35 |
|
pastebot0 joined #evergreen |
| 04:40 |
|
Phenol2 joined #evergreen |
| 04:44 |
|
ldwhalen_ joined #evergreen |
| 05:04 |
|
dbwells_ joined #evergreen |
| 05:07 |
|
ldwhalen_ joined #evergreen |
| 05:07 |
|
Phenol2 joined #evergreen |
| 05:07 |
|
remingtron_ joined #evergreen |
| 05:07 |
|
paxed joined #evergreen |
| 05:07 |
|
linuxpoet joined #evergreen |
| 05:07 |
|
ktomita joined #evergreen |
| 05:07 |
|
Pibbits joined #evergreen |
| 05:07 |
|
bshum joined #evergreen |
| 05:07 |
|
pinesol_green joined #evergreen |
| 05:07 |
|
rri joined #evergreen |
| 05:07 |
|
pmurray joined #evergreen |
| 05:07 |
|
dbs joined #evergreen |
| 05:07 |
|
egbuilder_ joined #evergreen |
| 05:07 |
|
b_bonner joined #evergreen |
| 05:07 |
|
wjr_ joined #evergreen |
| 05:07 |
|
jeff_ joined #evergreen |
| 05:07 |
|
mtj_ joined #evergreen |
| 05:10 |
|
b_bonner joined #evergreen |
| 05:10 |
|
egbuilder_ joined #evergreen |
| 05:15 |
|
remingtron__ joined #evergreen |
| 05:15 |
|
Phenol joined #evergreen |
| 05:16 |
|
ktomita_ joined #evergreen |
| 05:17 |
|
Pibbits2 joined #evergreen |
| 05:18 |
|
dexap joined #evergreen |
| 05:19 |
|
pinesol_green` joined #evergreen |
| 07:03 |
|
ktomita joined #evergreen |
| 10:58 |
|
Dyrcona joined #evergreen |
| 11:06 |
Dyrcona |
hanging out in #git and waiting for the current discussion to die down before I ask what to some would be a stupid question. |
| 11:06 |
Dyrcona |
Think I'll ask it here. |
| 11:06 |
Dyrcona |
I am working on a branch for Billing Enhancement #1 from MassLNC, I won't link to the documents because it is not relevant to my question. |
| 11:07 |
Dyrcona |
I want to include the work I did on LP 965656 because there is a minor conflict, plus I think that branch will make it into master sooner rather than later. |
| 11:07 |
pinesol_green` |
Launchpad bug 965656 in Evergreen "Close transactions after fines are voided, " (affected: 8, heat: 42) [Medium,Confirmed] https://launchpad.net/bugs/965656 |
| 11:08 |
Dyrcona |
Should I checkout the branch from the LP bug, rebase it on master, and then rebase my branch on that rebase LP branch? |
| 11:08 |
Dyrcona |
Would that cause any problems if I later rebase my branch on master after the original LP branch goes in? |
| 11:17 |
Dyrcona |
Nifty! Never seen git report a rebase like the one I just had... |
| 11:20 |
Dyrcona |
Doh! I either forget the channel or pastebot is on vacation: http://paste.evergreen-ils.org/10 |
| 11:21 |
Dyrcona |
git show looks good, so I guess that worked. |
| 11:22 |
Dyrcona |
Should a push a rebased branch to the git repository, or hope that when someone else cherry-picks that all goes well? |
| 11:53 |
jcamins |
Dyrcona: you should push the entire branch when rebasing. Applying a rebased patch will usually fail unless the entire branch has been pushed to a shared remote. |
| 11:53 |
jcamins |
Because the deltas are based on a patch that git won't be able to identify in order to rewind. |
| 11:54 |
Dyrcona |
jcamins: I know that I'll need to force push the whole thing. I just wonder what the other EG devs think about my doing a force push or leaving it as is. |
| 11:54 |
Dyrcona |
The rebase worked fine, so far. |
| 11:54 |
jcamins |
Dyrcona: oh, okay. In that case, no idea. |
| 11:57 |
Dyrcona |
I'm getting what I think is good advice in #git. |
| 11:57 |
Dyrcona |
At least for what do after the bug fix is in master, and I want to rebase my feature branch on master afterward. |
| 11:58 |
Dyrcona |
I think I'll force push my bug fix. I don't think anyone other than maybe bshum has looked at it, yet. |
| 12:07 |
Dyrcona |
Nifty. The consensus in #git is we should be doing merges and not cherry-picks. I'm going to do some more research on the inner workings of git to see the technical differenes. |
| 12:08 |
Dyrcona |
Well, I'm not sure the only 3 people who responded to my query counts as consensus, but they certainly gave me something to look into. |
| 12:09 |
Dyrcona |
And, blah, blah, blah.... |
| 12:09 |
Dyrcona |
Everyone else must be at the pool. ;) |
| 12:12 |
Dyrcona |
Heh. Cool. 107 commits since June 11. |
| 12:17 |
Dyrcona |
@monologue |
| 12:17 |
pinesol_green` |
Dyrcona: Your current monologue is at least 9 lines long. |
| 12:22 |
Dyrcona |
Perhaps I should read Pro Git again? |
| 12:29 |
|
stevenyvr2 joined #evergreen |
| 12:29 |
|
stevenyvr2 left #evergreen |
| 13:12 |
paxed |
well, saturday is good for monologuing... |
| 15:09 |
Dyrcona |
Saturday is also good for spending two hours in the pool. |
| 15:12 |
Dyrcona |
Now that I have apcupsd running on my gateway and sending me emails every time the UPS goes on battery, I get to see just how crappy the power is in my neighborhood. |
| 15:13 |
Dyrcona |
On the plus with two computers plugged into the UPS, it only at 12% load. |
| 16:19 |
paxed |
heh. i used to run a server in my flat, with no ups. when i retired it, it had 1320+ days uptime. |
| 16:46 |
Dyrcona |
Well, you live in a civilized country with a decent power grid. |
| 20:52 |
|
mcooper joined #evergreen |
| 21:59 |
|
stevenyvr2 joined #evergreen |
| 21:59 |
|
stevenyvr2 left #evergreen |
