<Gaelan>
I most recently tried "git merge f2478462740cd4e9c7f245e2711d6b851d153a8f", a commit that (AFAICT) appears on both master and staging
<jtojnar>
rebasing onto the tip of staging would probably be best
<Gaelan>
eww, rebase… but I'll see if it works
__monty__ has quit [Quit: leaving]
<Gaelan>
thanks, that worked! jtojnar++
<{^_^}>
jtojnar's karma got increased to 68
<jtojnar>
generally, it is better to rebase (for cleaner history) or merge on as recent commit as you can in your target branch
<jtojnar>
you only need to use the common commit between branches when you want to change target branch on GitHub and want to avoid pinging ton of people
<supersandro2000>
IIRC ``git checkout -b X master staging``
<supersandro2000>
also having merge commits in PR is a blocker for me
supersandro2000 has quit [Disconnected by services]
supersandro2000 has joined #nixos-dev
<hexa->
jtojnar++ for explaining the flags array issue
<{^_^}>
jtojnar's karma got increased to 69
cole-h has joined #nixos-dev
mkaito has quit [Quit: WeeChat 3.0]
rajivr has joined #nixos-dev
orivej has quit [Ping timeout: 246 seconds]
orivej has joined #nixos-dev
jonringer has joined #nixos-dev
LnL has quit [Ping timeout: 264 seconds]
LnL has joined #nixos-dev
orivej has quit [Ping timeout: 256 seconds]
LnL- has joined #nixos-dev
LnL has quit [Ping timeout: 260 seconds]
jonringer has quit [Remote host closed the connection]
srhb has quit [Read error: Connection reset by peer]
srhb has joined #nixos-dev
jkkm has quit [Read error: Connection reset by peer]
typetetris has quit [Read error: Connection reset by peer]
jkkm has joined #nixos-dev
typetetris has joined #nixos-dev
supersandro2000 has quit [Quit: Ping timeout (120 seconds)]
supersandro2000 has joined #nixos-dev
tom39291 has quit [Remote host closed the connection]
<gchristensen>
Mic92: ofborg cannot evaluate the *target* branch, so it can't calculate differences. if you know it fixes it, you'll just have to merge it
<gchristensen>
it would be nice if ofborg did not so strongly object when the target branch is broken
<Mic92>
gchristensen: ah. so it first checks staging and fails because evaluation fails?
<Mic92>
Now it makese sense
<gchristensen>
yeah, to get baseline numbers and dervitations to compare against
<Mic92>
Well I do the same in nixpkgs-review
<Mic92>
I will just go ahead and merge my fix than
<gchristensen>
luckily ofborg is not of legal drinking age
<Mic92>
gchristensen: I guess its feasible to detect broken master and see if a PR fixes the issue, but this is so rare these days that it is probably not worth it.
<gchristensen>
right
<Mic92>
I would rather invest time in a merge bot.
<Mic92>
like bors
<gchristensen>
that does sound like a good idea :)
<gchristensen>
changing ofborg to continue when the target branch fails to evaluate would maybe not be such a nightmare, it would be changing fields to be Optional and then chasing the compiler through all its complaints I suppose
<rmcgibbo[m]>
looks like this is the third time today i've seen `timed out after 300 seconds of silence`
<rmcgibbo[m]>
I think I should just completely disable `--silent-timeout`...
<rmcgibbo[m]>
hexa-: I deployed a new version that removed `--silent-timeout`, but I still do have a 1hr-per-drv and 2-hrs-for-the-whole build limit in place.
mkaito has quit [Quit: WeeChat 3.0]
FRidh has quit [Quit: Konversation terminated!]
<rmcgibbo[m]>
hexa-: In fact -- I'm just going to have the bot refrain from commenting at all if any of the packages hit a timeout during my build.