Stacked changes: how FB and Google engineers stay unblocked and ship faster

Re:Stacked changes: how FB and Google engineers stay unblock... by gibolt on Wednesday November 17, 2021 @12:42PM (#29256187)

The ability to quickly manage branches and reorder commits within them in Mercurial is super powerful, something that Git and `rebase -i` could only dream of.

Doing the same in Phabricator is awesome. One blocking commit PR on the bottom of a stack can easily be moved to the top or a new stack, unblocking the rest of your changes. Re-writing and entire stack due to one small change is mostly eliminated.

(Good) Tooling is a major gain in efficiency.

[ Parent | on HN ]

Re:Stacked changes: how FB and Google engineers stay unblock... by tadfisher on Thursday November 18, 2021 @12:18AM (#29262197)

> The ability to quickly manage branches and reorder commits within them in Mercurial is super powerful, something that Git and 'rebase could only dream of.

This is a git CLI wart more than anything. Magit (git interface in Emacs) makes juggling branches/worktrees and rewriting history intuitive to humans. I feel super-powerful in Magit and absolutely feeble using the CLI.

[ Parent | on HN ]

Re:Stacked changes: how FB and Google engineers stay unblock... by surajrmal on Thursday November 18, 2021 @02:08AM (#29262860)

I completely agree. When Google decided to invest in a mercurial front end to their version control system a few years ago, I was confused, but after using it for a while, I can honestly say it has much better ergonomics for common workflows. Creating a tree of dependent commits is simple and trivial. I sometimes wish I could create a dag instead, but that's probably more trouble than it's worth.

[ Parent | on HN ]