| Hg is working on a feature that is betaish right now: http://mercurial.selenic.com/wiki/ChangesetEvolution It's been brewing for some time. Basically, the idea is to be able to make it easy to safely edit history collaboratively, with a consistent UI. Facebook is pumping a lot of money into hg right now, and seems particularly interested in getting this feature off the ground. A number of pieces have been falling into place for this to occur. The first was to have phases, indicators of which commits are safe to edit collaboratively or not, a feature that some git users have wanted: https://github.com/peff/git/wiki/SoC-2012-Ideas#published-an... Mercurial now has this feature and uses it as part of the logic for the evolve extension. With this in place, hg is able to transmit metadata that indicates automatically which commits need to be fixed up if you want to edit a commit that someone else has also edited, or if someone edited a commit on top of which you've based off other commits. The idea is to make something like "git push --force" obsolete. History is safe to edit, and commits can't get lost, not even by accident: http://www.infoq.com/news/2013/11/use-the-force By the way, an epilogue to that Jenkins story is that it wasn't completely trivial to recover all lost history, and at least for some of the smaller repos, they never managed to figure out exactly which version was the canonical one. |