4 ms·
I find the way your phrase that question interesting. Git and Mercurial are nearly identical in terms of functionality, to the point that converting back and fo
by tghw 16y ago
I find the way your phrase that question interesting. Git and Mercurial are nearly identical in terms of functionality, to the point that converting back and forth between them is pretty trivial. (Example: here's Git's repository in Mercurial https://mirrors.kilnhg.com/Repo/Mirrors/From-Git/Git https://mirrors.kilnhg.com/Repo/Mirrors/From-Git/Git)
The only real difference between the two are the ecosystems. Mercurial, being written is Python, is very portable and easily extensible. I feel like, because of that, the tools for Mercurial are better. Git has GitHub, and the incredible open source community they've developed there.
* Note, the rainbow road is due to one of the few differences between Git and Hg: Hg does not allow octopus merges, so the conversion turns them to a sequence of two at a time merges. Also, in the interest of full disclosure, I'm one of the devs on Kiln, so I'm certainly biased towards Hg.
- js2 16y agooctopus merges are rare in the git.git repo: $ git rev-list --merges --parents --tags | awk '{print (NF-1)}' | sort | uniq -c 4409 2 22 3 5 4 3 5 1 6 So there's been a total of 31 octopus merges compared to 4409 typical two-parent merges.
- jrockway 16y agoHow many Octocat merges have there been?
- burgerbrain 16y agoOn the other hand, roughly an entire 2% of merges on linus's linux tree have been octopus merges. Hardly something to scoff at. 5 10 6 11 5 12 3 13 2 14 1 18 14592 2 1 20 1 21 1 24 129 3 1 30 50 4 25 5 21 6 13 7 18 8 7 9
- lloeki 16y agoRelative occurence numbers don't say much about the need for octopus. Maybe they're rare but when the need arises it proves to be an invaluable feature.
- geekam 16y agoWow! Nice to meet you. I wish my work was as interesting as yours.