Mark Amery

Some further commentary: `mysql2`, the library you use to connect to MySQL, supports socket-based connections like this... ``` conn = mysql.createConnection({socketPath: '/var/run/mysqld/mysqld.sock', user: 'root'}) ``` ... but obviously you'd need...

Further simplified version (which hints a bit at what's going on - presumably `t3` vanishes in part because it isn't included at all in the hunk in the first patch,...

Hmm. Just started looking at the merge.js code and besides the already-reported bugs I see more to dislike; `loadPatch` seems to heuristically detect if the passed param is a patch...

I just had another few minutes to look at this. I've been reading the key bit of logic here and trying to reason about it: ``` while (mineIndex < mine.hunks.length...

Yeah, the bug I spotted in review is real. Here's a demo script: ``` diff = require('.'); patch1 = `--- foo.txt 2024-06-26 20:47:03.936414424 +0100 +++ bar.txt 2024-06-26 20:47:04.892377928 +0100 @@...

Plan: * add test cases for the bug above and for https://github.com/kpdecker/jsdiff/issues/341. * rewrite the core logic for merging hunks (in `merge` and `mergeLines`) from scratch, without paying too much...

Oh man - I just looked at tests and realised that the existing code intentionally tries to support the case where the two patches use a different base file (rather...

The more I think about this the more I think it's actually super-complicated. Here are six different tasks that you might characterise as merging two patches, but which are different...

Okay my new plan is to abandon this. :P I'm not gonna close any of the issues. But I'm not gonna do more work on it either. I don't have...

Interesting. https://github.com/kpdecker/jsdiff/issues/254 was about the same behaviour in the context of jsdiff's patch-generation functions, and I closed it saying the behaviour is correct. I think I agree with myself with...