[15:25] <jrwren> meld sucks and is slow... kdiff3 doesn't have undo.  I guess I'll try p4merge? Are there really no great merge tools, only passable ones?
[15:37] <cmaloney> If it can't be done using diff and patch it's not worth doing
[15:38] <cmaloney> also: good morning
[15:41] <jrwren> well, that simply isn't true.
[15:42] <jrwren> what happens when your base changes and the patch no longer applies? start over?
[16:04] <rick_h> sorry, I use meld when I need something more than vimdiff
[16:04] <rick_h> so nothing better for you, beyondcompare is supposed to be nice but don't have it
[16:06] <jrwren> maybe I'll try vimdiff.  ugh.
[16:06] <jrwren> I think this is the largest conflicting merge i've ever done. it always sucks.
[16:19] <jrwren> oh wow... VS Code detects unmerged changes and offers a beautiful gui.
[18:37] <cmaloney> Yeah, I use vimdiff as well
[18:37] <cmaloney> but yeah, things can get messy quickly
[18:37] <cmaloney> Also I think VSCode is borrowing heavily from Atom  iirc
[18:39] <jrwren> ugh... some tool I used merged wrong and I'm still recoverying.
[18:39] <jrwren> gonna be like 8hrs of merging.
[18:44] <cmaloney> what the hell happened?
[18:45] <jrwren> just two big changes to the same codebase
[18:45] <greg-g> are they already committed? Sounds like they're so large a human readable diff is worthless
[18:46] <jrwren> its not that big. it will get reviewed in gerrit.
[18:47] <jrwren> its almost like every part of the patch had merge conflict
[18:48] <greg-g> ahh
[18:49] <greg-g> and wow, ya'll chose gerrit? we have a love/hate relationship with it here
[18:49] <greg-g> as most people have with most code review systems
[18:49] <jrwren> I hate gerrit
[18:49] <greg-g> :)
[18:49] <jrwren> but it is what we use.
[18:49] <jrwren> and its probably better than whatever is in BB
[18:49] <jrwren> because atlassian is the literal worst.
[18:50] <greg-g> I tried to get us to migrate to Diffrential (Phabricator) but there was enough crabbiness from oldtimers we didn't
[18:50] <greg-g> :)
[18:50] <jrwren> i honestly didn't think atlassian could be that bad until I started using their products.
[18:50] <jrwren> I guess someone has to give IBM/Rational a run for worst.
[18:50] <cmaloney> Wow, that's a nice bar
[19:36] <jrwren> finally done.  WHEW
[19:36] <jrwren> good times!
[19:36] <jrwren> only 3.5hrs, not quite as bad as it felt.
[19:37] <jrwren> and since greg-g asked, the diff is +3255, -115, but 1303 of that +3255 is generated code, so really only +2000 loc
[19:40] <greg-g> 2000?! still huge
[19:40] <greg-g> Differential doesn't show diffs that big because it's outside realistic human review
[19:41] <jrwren> really?
[19:41] <jrwren> its really not that big.
[19:42] <jrwren> I mean... mabye that is huge for python or PHP
[19:42] <rick_h> that's pretty big, I think when we did limits 800ish was as big as we'd allow
[19:42] <jrwren> but for go, remember 75% of that looks like: if err != nil { return err }
[19:42] <jrwren> on 4 lines
[19:42] <rick_h> lol
[19:43] <greg-g> I forget the line number cut off, but here's their reasoning: https://secure.phabricator.com/book/phabricator/article/differential_large_changes/
[20:21] <cmaloney> Yipes, taht's a lot of LoC for diffs
[20:24] <jrwren> its really not that big.
[20:28] <jrwren> https://lwn.net/Articles/737937/  +3407 -30, for comparison :p
[20:29] <jrwren> https://lwn.net/Articles/738170/  +3359 -28  for comparison to add all of SMBD to the kernel. LOL