Lix Development | 415 Members | |
| (Technical) development of Lix, the package manager, a Nix implementation. Please be mindful of ongoing technical conversations in this channel. | 139 Servers |
| Sender | Message | Time |
|---|---|---|
| 1 Aug 2025 | ||
| I really feel like there is a knowledge gap in how much simple merge tooling that Git supports as well as Jujutsu will resolve all formatting conflict issues automatically and that a small amount of documentation could resolve this, but I also understand that it's effectively not up for discussion | 16:37:27 | |
| because when you drum it too hard, I hear "let's make the experience great for jj users and for git… well doable but enjoy" | 16:37:27 | |
| alright. I was replying to you talking about the Jujutsu workflow around this. if you had asked about Git I could have given that information too :) | 16:37:54 | |
| it's a risk aversion thing | 16:37:54 | |
| yeah what i was focusing on is "emilazy cannot format their diffs nicely with jj on lix contributions, so i will try jj and understand what is broken or what could be improved" | 16:38:29 | |
| and maybe write docs on how to use jj with lix and stuff | 16:38:35 | |
| if it's a one line config or something that can injected in the dev shell | 16:38:48 | |
(fwiw: https://github.com/emilio/clang-format-merge/blob/master/clang-format-merge. shipping something of this complexity in the repo will make git mergetool automatically resolve all formatting conflicts) | 16:39:38 | |
| if it was this simple I already would have solved the issue and not chimed in re: WeetHet's problems
I think the options are using a colocated repository so the Git reformatter thing can work (and hoping that it works with detached | 16:44:41 | |
these are also not Jujutsu-specific problems, e.g. any use of git revise or git-branchless or Sapling will also not be getting pre-commit hooks | 16:45:07 | |
or even in 100% upstream Git, git replay which is faster than git rebase because it is in-memory | 16:45:24 | |
| I don't understand why jj couldn't pass the diff to tools to fix up only certain hunks but ok | 16:45:55 | |
| but understood | 16:46:32 | |
In reply to @emilazy:matrix.orgwe use git revise a lot. we have occasionally needed to manually reformat a commit because of it | 16:46:50 | |
| Charles you have testing to do — https://gerrit.lix.systems/c/lix/+/3856 :P | 16:46:54 | |
| ma27 thanks boss | 16:47:55 | |
| of course there is no fundamental reason (because you can do it with Git) but
so I do not find it surprising that there is no existing surface exposed for this | 16:50:53 | |
(like the fact that formatting is history-dependent is also why treefmt cannot be used for the C++ part of the codebase, it is just an awkward layering to expose to tooling) | 16:52:40 | |
| I will take all of this home and think about it and do more homework | 16:52:45 | |
| i could try to consolidate the conversation into an issue if that would be helpful, assuming the involved parties (raito and emily) are okay with that | 16:55:01 | |
| probably just copy+pasting the relevant/substantive bits directly from matrix lol | 16:55:22 | |
| FWIW cppnix codebase has been reformatted. | 16:56:02 | |
| if you'd like to see such an issue I'll see if I have energy to put my thoughts in more organized form in a little while, if you'd like to save yourself the trouble | 16:57:14 | |
| (I just think it is only worth having an issue if there is a possibility that the information it contains could result in a changed decision) | 16:57:31 | |
| i mean it seems like the chance is nonzero at least | 16:58:39 | |
In reply to @charles:computer.surgeryyep, would be good | 16:59:33 | |
In reply to @emilazy:matrix.orgI won't lie, I think the bar is very high for such a decision to happen | 16:59:55 | |
| So I don't want to be deceptive and snipe you | 17:00:00 | |
| I'm open to approach it with an open mind and look at it for what it is | 17:00:08 | |
was that assessment made with or without knowledge of the existence of git mergetool? 😅 | 17:00:42 | |