Newest at the top
| 2025-07-13 11:28:12 +0200 | michalz | (~michalz@185.246.207.197) |
| 2025-07-13 11:24:32 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 11:23:27 +0200 | dtman34 | (~dtman34@c-73-242-68-179.hsd1.mn.comcast.net) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 11:23:07 +0200 | Square | (~Square@user/square) Square |
| 2025-07-13 11:22:06 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 272 seconds) |
| 2025-07-13 11:18:52 +0200 | Tuplanolla | (~Tuplanoll@91-159-69-59.elisa-laajakaista.fi) Tuplanolla |
| 2025-07-13 11:18:08 +0200 | dtman34 | (~dtman34@c-73-242-68-179.hsd1.mn.comcast.net) dtman34 |
| 2025-07-13 11:17:23 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 11:16:36 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 11:15:46 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 272 seconds) |
| 2025-07-13 11:10:52 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 11:10:03 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) dtman34 |
| 2025-07-13 11:03:24 +0200 | <tomsmeding> | merging two incompatible large refactors of a codebase sounds like a hopeless task for any automated system |
| 2025-07-13 11:03:21 +0200 | Enrico63 | (~Enrico63@2a0b:e541:10d0:0:9efc:e8ff:fe24:3213) (Quit: Client closed) |
| 2025-07-13 11:02:24 +0200 | <tomsmeding> | also how are you even planning to attack that with a custom merge tool |
| 2025-07-13 11:02:08 +0200 | <tomsmeding> | reformat all versions with the same formatter now, and _then_ merge? |
| 2025-07-13 11:01:38 +0200 | <[exa]> | (with incompatible formatters) |
| 2025-07-13 11:01:30 +0200 | <[exa]> | this is 3 large refactors all of which included complete reformat of the code |
| 2025-07-13 11:01:08 +0200 | ljdarj | (~Thunderbi@user/ljdarj) ljdarj |
| 2025-07-13 11:00:56 +0200 | <Enrico63> | [exa] 3 way merge, then ? |
| 2025-07-13 11:00:06 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 252 seconds) |
| 2025-07-13 11:00:04 +0200 | <tomsmeding> | my condolences |
| 2025-07-13 10:59:59 +0200 | sprotte24 | (~sprotte24@p200300d16f118b009de684e40fbf0935.dip0.t-ipconnect.de) |
| 2025-07-13 10:59:57 +0200 | <tomsmeding> | O.o |
| 2025-07-13 10:59:14 +0200 | <[exa]> | spoiler: I got some stuff to merge that is so messed up that yakshaving a new mergetool will save an order of magnitude of effort |
| 2025-07-13 10:58:43 +0200 | <[exa]> | tomsmeding: yeah well aware of that |
| 2025-07-13 10:55:08 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 10:53:26 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 10:52:33 +0200 | <Enrico63> | [exa], wonderful, thanks!!! |
| 2025-07-13 10:51:55 +0200 | fp1 | (~Thunderbi@hof1.kyla.fi) fp |
| 2025-07-13 10:50:24 +0200 | poscat | (~poscat@user/poscat) poscat |
| 2025-07-13 10:48:23 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) dtman34 |
| 2025-07-13 10:47:35 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 10:47:20 +0200 | poscat0x04 | (~poscat@user/poscat) (Remote host closed the connection) |
| 2025-07-13 10:44:01 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 248 seconds) |
| 2025-07-13 10:41:10 +0200 | caubert | (~caubert@user/caubert) caubert |
| 2025-07-13 10:39:51 +0200 | tromp | (~textual@2001:1c00:3487:1b00:89d3:7d92:7b20:925) (Quit: My iMac has gone to sleep. ZZZzzz…) |
| 2025-07-13 10:39:17 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 10:36:46 +0200 | <tomsmeding> | (like "how far is distant enough") |
| 2025-07-13 10:36:38 +0200 | <tomsmeding> | and include some of the arbitrary choices/heuristics made in the algorithm |
| 2025-07-13 10:36:24 +0200 | <tomsmeding> | so any property to prove/test about a merge algorithm will necessarily have to be lower-level than "it does the right thing" |
| 2025-07-13 10:35:47 +0200 | trickard_ | trickard |
| 2025-07-13 10:35:40 +0200 | <tomsmeding> | because in code, changes are sometimes nonlocal, and merging will consider spacially distant changes to be logically unrelated |
| 2025-07-13 10:35:01 +0200 | <tomsmeding> | also even if you give merging a spec, if that spec includes behaviour of current conventional merge algorithms, then it's still insufficient to actually be able to trust it in practice |
| 2025-07-13 10:32:23 +0200 | <[exa]> | hm maybe I generate a random merged file with conflicts, make the orig+mine+yours from that, and see what happens |
| 2025-07-13 10:32:13 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) dtman34 |
| 2025-07-13 10:31:35 +0200 | <[exa]> | I could go the hard way and deconstruct the diff-zipping algorithm into a generator but that's more effort than I hoped for |
| 2025-07-13 10:31:24 +0200 | dtman34 | (~dtman34@c-73-242-68-179.hsd1.mn.comcast.net) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 10:30:52 +0200 | <[exa]> | so kinda wondering how to relate it to the originals |
| 2025-07-13 10:30:44 +0200 | <[exa]> | with diff3 you have this orig+mine+yours and it produces a merged thing |