4 ms·

Shout out https://sapling-scm.com/ https://sapling-scm.com/ who makes this workflow even better.

• chrisweekly 3y ago
  Interesting; first I've heard of Sapling SCM. Any other comments about it?
  • Shish2k 3y ago
    I’ve been using it for a while, primarily to get all the benefits of the mercurial UX while still using github as a backend, but yes it also makes the stacked-diff workflow[0] really nice thanks to features like “absorb” which will smartly amend changes to a branch (eg if your branch contains one commit to add a server and another commit to add a client, you make changes to both files, then run “absorb”, your server changes will be amended to the server commit and client changes are amended to the client commit) :) [0] Rather than a PR containing three commits “Add server” -> “Add client” -> “fix server”, it is encouraged to submit a PR of “Add server (v2)” -> “Add client” (with the original buggy “Add server (v1)” still visible in the code-review tool, so that you can see what changed in v1 vs v2, while what gets merged into the master branch is only the final bug-free v2)
    • capitainenemo 3y ago
      Does it support phases? If it has phases, absorb, hg grep --diff, hg fa --deleted, and revsets, that would be pretty much all I need :)
    • chrisweekly 3y ago
      Thanks! That's helpful.