Lots to digest here! I have been keeping an eye on Pijul so it is cool to see some of its features implemented in jj. Sapling[0], similarly, is a new VCS tool out there which can work with a git repo. It also has anonymous branches, no staging area, supports stacked commits and can track the history of a commit over time. I've been using a similar workflow to the article's author: git with a UI to handle commits of hunks of a file to group related changes. My working branch often has unrelated changes that get tossed from branch to branch as I am able to commit. I haven't figured out where these new tools fit into my workflow yet, but I am glad there's new options that will help making working on a project more flexible and organized.
I really liked using Sapling internally at Meta (they call it hg/mercurial internally, lots of people don't even know it's not actually hg under the hood).
Is the publicly available version of Sapling usable? I really miss stacked diffs every time I'm working on a GitHub project. Last I checked it seemed there were some dependencies on Mononoke and EdenFS which are not open source.
To be honest, git is really close to perfect, except for the interface, which is horrendous. I don't think, personally, there's a pressing need for something substantially different.
I'd imagine a binary that replaces git commands with other, saner ones, will do 95% of the work, while retaining compatibility with both past repos and the whole world wanting to use git.
None of pijul's feature have been implemented in Jujutsu. No change commutativity, no associativity, no actual modelling of conflicts. Jujutsu is a better `git rerere`: a good heuristic, but not an algorithm.
Of course if there is an algorithm at some point, it would be really cool to see it described somewhere.
Comments
Lots to digest here! I have been keeping an eye on Pijul so it is cool to see some of its features implemented in jj. Sapling[0], similarly, is a new VCS tool out there which can work with a git repo. It also has anonymous branches, no staging area, supports stacked commits and can track the history of a commit over time. I've been using a similar workflow to the article's author: git with a UI to handle commits of hunks of a file to group related changes. My working branch often has unrelated changes that get tossed from branch to branch as I am able to commit. I haven't figured out where these new tools fit into my workflow yet, but I am glad there's new options that will help making working on a project more flexible and organized.
[0]: https://sapling-scm.com
I really liked using Sapling internally at Meta (they call it hg/mercurial internally, lots of people don't even know it's not actually hg under the hood).
Is the publicly available version of Sapling usable? I really miss stacked diffs every time I'm working on a GitHub project. Last I checked it seemed there were some dependencies on Mononoke and EdenFS which are not open source.
Yes — I've been using it as a Git replacement for a few months now. A little rough around the edges but mostly it just feels like a better Git to me.
To be honest, git is really close to perfect, except for the interface, which is horrendous. I don't think, personally, there's a pressing need for something substantially different.
I'd imagine a binary that replaces git commands with other, saner ones, will do 95% of the work, while retaining compatibility with both past repos and the whole world wanting to use git.
None of pijul's feature have been implemented in Jujutsu. No change commutativity, no associativity, no actual modelling of conflicts. Jujutsu is a better `git rerere`: a good heuristic, but not an algorithm.
Of course if there is an algorithm at some point, it would be really cool to see it described somewhere.