News for hackers. Stuff that matters.
Re:We should revisit literate programming in the agent era by necovek on Monday March 09, 2026 @12:31PM (#47311303)
Not really. Launchpad.net does not have any public branches I could share atm as an example, but Bazaar (now breezy) allowed having a nested "merge commit": your trunk would have "flattened" merge commits ("Merge branch foo"), and under it you could easily get to each individual commit by a developer ("Prototype", "Add test"...). It would really be shown as a tree, but smartness was wven richer.

This was made possible by using a DAG for commit storage and referencing, instead of relying on file contents and series of commits per reference. Merge behaviour was much smarter in case of diverging tip or criss-cross merges. But this ultimately was harder and slower to implement, and developers did not value this enough and they instead accepted the Git trade-offs.

So you seamlessly did both with a different VCS without splitting those up: in a sense, computers and software worried about that for us.

Re:We should revisit literate programming in the agent era by eru on Monday March 09, 2026 @07:28PM (#47317192)
I am not quite sure what you are describing here. Git's underlying commit graph is a DAG.

You can use different, custom merge-drivers (or whatever it's called) for Git to get the behaviour you describe here.

Re:We should revisit literate programming in the agent era by necovek on Tuesday March 10, 2026 @02:04AM (#47319554)
Certainly, but merges are treated differently by default, and getting to this sort of output would require "custom" tooling for things like "git log".

Whereas bzr just did the expected thing.

Re:We should revisit literate programming in the agent era by 1718627440 on Tuesday March 10, 2026 @07:45AM (#47321932)
You can select whether you want the diff to the first or the second parent, which is the difference between collapsing and expanding merges. You can also completely collapse merges by showing first-parent-history.

Or I do not understand what you mean with "the expected thing".

Re:We should revisit literate programming in the agent era by eru on Tuesday March 10, 2026 @09:41PM (#47330913)
Yes, `git log --first-parent` has been a godsend for coping with our team's messy non-cleaned up history.