blocks|key|1560875|text|我目前正在从SVN迁移到DVCS的过程中(同时在博客上记录我的发现，我的第一个真正的博客努力...)，我已经做了一些研究(=googling)。据我所知，你可以用这两个包做大多数事情。git似乎实现了更多或更好的高级功能，我确实觉得与windows的集成比mercurial和TortoiseHg更好一些。我知道也有Git+Cheetah+(我都试过了)，但mercurial解决方案感觉更健壮。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1560876|看看它们都是如何开源的(对吧？)我认为这两个都不会缺少重要的功能。如果某个东西很重要，人们会要求它，人们会对它进行编码。|1560877|我认为对于常见的做法，Git和Mercurial已经足够了。它们都有使用它们的大型项目(当然还有Git+Mozilla+linux内核、Mercurial+->+Mozilla+foundation等项目)，所以我不认为他们中的任何一个真正缺少什么。|1560878|话虽如此，我对其他人对此的评论很感兴趣，因为这将是我博客努力的一个很好的来源;-)|1560879|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

I'm currently in the process of migrating from SVN to a DVCS (while blogging about my findings, my first real blogging effort...), and I've done a bit of research (=googling). As far as I can see you can do most of the things with both packages. It seems like git has a few more or better implemented advanced features,
I do feel that the integration with windows is a bit better for mercurial, with TortoiseHg. I know there's Git Cheetah as well (I tried both), but the mercurial solution just feels more robust.

Seeing how they're both open-source (right?) I don't think either will be lacking important features. If something is important, people will ask for it, people will code it. 

I think that for common practices, Git and Mercurial are more than sufficient. They both have big projects that use them (Git -> linux kernel, Mercurial -> Mozilla foundation projects, both among others of course), so I don't think either are really lacking something.

That being said, I am interested in what other people say about this, as it would make a great source for my blogging efforts ;-)

blocks|key|1776079|text|去年的某个时候，我评估了git和hg作为我自己的使用，并决定使用hg。我觉得它看起来像一个更干净的解决方案，而且当时在更多的平台上工作得更好。不过，这在很大程度上是一个摇摆不定的问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1776080|最近，由于git-svn和充当Subversion客户端的能力，我开始使用git。这赢得了我的心，我现在已经完全转到了git。我认为它有一个稍高的学习曲线(特别是如果你需要探索内部)，但它真的是一个很棒的系统。我现在要去读一下John发布的那两篇比较文章。|1776081|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

Sometime last year I evaluated both git and hg for my own use, and decided to go with hg. I felt it looked like a cleaner solution, and worked better on more platforms at the time. It was mostly a toss-up, though.

More recently, I started using git because of git-svn and the ability to act as a Subversion client. This won me over and I've now switched completely to git. I think it's got a slightly higher learning curve (especially if you need to poke around the insides), but it really is a great system. I'm going to go read those two comparison articles that John posted now.

blocks|key|1560977|text|没什么。它们做的是一样的，表现也差不多。你应该选择一个而不是另一个的唯一原因是，如果你帮助一个已经使用了一个的项目。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1560978|选择其中一个系统的另一个可能原因是应用程序或服务仅支持其中一个系统。例如，我很大程度上是因为github才选择学习git的。|offset|length|1560979|entityMap|0|LINK|mutability|MUTABLE|url|http://github.com/^0|0|1A|6|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@$D|P|E|Q|1|R]]|A|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|M]]]]

Nothing. They both do the same, both perform about equally. The only reason you should choose one over the other is if you help out with a project that already uses one..

The other possible reason for choosing one is an application or service which only supports one of the system.. For example, I pretty much chose to learn git because of <a href="http://github.com" rel="nofollow noreferrer">github</a>..

blocks|key|1776181|text|在InfoQ's+guide+about+DVCS的git，Mercurial和Bazaar上有一个很好的和详尽的比较表格和图表。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1776182|entityMap|0|LINK|mutability|MUTABLE|url|http://www.infoq.com/articles/dvcs-guide^0|1|O|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

There is a great and exhaustive comparison tables and charts on git, Mercurial and Bazaar over at <a href="http://www.infoq.com/articles/dvcs-guide" rel="nofollow noreferrer">InfoQ's guide about DVCS</a>.

blocks|key|1776234|text|最大的区别是在Windows上。Mercurial是原生支持的，但Git不支持。你可以通过bitbucket.org获得与github.com非常相似的托管(实际上更好的是因为你得到了一个免费的私有存储库)。我曾经使用过一段时间的msysGit，但后来转而使用Mercurial，我对它非常满意。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1776235|entityMap|0|LINK|mutability|MUTABLE|url|http://bitbucket.org/|1|http://www.github.com/^0|19|D|0|1P|A|1|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]|$A|R|B|S|1|T]]|C|$]]|$1|D|3|-4|5|6|7|U|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]|L|$5|G|H|I|C|$J|M]]]]

The big difference is on Windows. Mercurial is supported natively, Git isn't. You can get very similar hosting to <a href="http://www.github.com" rel="nofollow noreferrer">github.com</a> with <a href="http://bitbucket.org" rel="nofollow noreferrer">bitbucket.org</a> (actually even better as you get a free private repository). I was using msysGit for a while but moved to Mercurial and been very happy with it.

blocks|key|1561211|text|在versioncontrolblog博客上有一个动态比较图，在那里你可以比较几个不同的版本控制系统。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1561212|Here+is+a+comparison+table+between+git,+hg+and+bzr.|offset|length|1561213|entityMap|0|LINK|mutability|MUTABLE|url|http://www.versioncontrolblog.com/comparison/Bazaar/Git/Mercurial/index.html^0|0|0|1F|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@$D|P|E|Q|1|R]]|A|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|M]]]]

There is a dynamic comparison chart over at the versioncontrolblog where you can compare several different version control systems. 

<a href="http://www.versioncontrolblog.com/comparison/Bazaar/Git/Mercurial/index.html" rel="nofollow noreferrer">Here is a comparison table between git, hg and bzr.</a>

blocks|key|1776380|text|mercurial和git还有另一个有趣的比较：Mercurial+vs+Git。主要关注内部结构及其对分支过程的影响。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1776381|entityMap|0|LINK|mutability|MUTABLE|url|http://rg03.wordpress.com/2009/04/07/mercurial-vs-git/^0|O|G|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

Yet another interesting comparison of mercurial and git: <a href="http://rg03.wordpress.com/2009/04/07/mercurial-vs-git/" rel="nofollow noreferrer">Mercurial vs Git</a>.
Main focus is on internals and their influence on branching process.

blocks|key|1561300|text|我认为对"Mercurial+vs.+Git“的最好描述是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1561301|"Git+is+Wesley+Snipes.+Mercurial+is+Denzel+Washington"|offset|length|1561302|entityMap|0|LINK|mutability|MUTABLE|url|http://www.ericsink.com/entries/hg_denzel.html^0|0|0|1I|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@$D|P|E|Q|1|R]]|A|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|M]]]]

I think the best description about "Mercurial vs. Git" is:

<a href="http://www.ericsink.com/entries/hg_denzel.html" rel="nofollow noreferrer">"Git is Wesley Snipes. Mercurial is Denzel Washington"</a>

blocks|key|1776513|text|当涉及到使用分支(特别是短期分支)时，会有相当大的差异。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1776514|在将Mercurial与Git进行比较的this+article+(BranchingExplained)中对其进行了解释。|offset|length|1776515|entityMap|0|LINK|mutability|MUTABLE|url|http://mercurial.selenic.com/wiki/BranchingExplained^0|0|K|X|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@$D|P|E|Q|1|R]]|A|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|M]]]]

There are quite significant differences when it comes to working with branches (especially short-term ones).

It is explained in <a href="http://mercurial.selenic.com/wiki/BranchingExplained" rel="nofollow noreferrer">this article (BranchingExplained)</a> which compares Mercurial with Git.

blocks|key|1561437|text|还有谷歌的比较(虽然有点旧，是在2008年做的)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1561438|http://code.google.com/p/support/wiki/DVCSAnalysis|offset|length|1561439|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|1E|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@$D|O|E|P|1|Q]]|A|$]]|$1|F|3|-4|5|6|7|R|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|C]]]]

Also google's comparison (though it's a bit old, done in 2008)

<a href="http://code.google.com/p/support/wiki/DVCSAnalysis" rel="nofollow noreferrer">http://code.google.com/p/support/wiki/DVCSAnalysis</a>

blocks|key|1776650|text|如果您是一名Windows开发人员，正在寻找基本的断开连接的版本控制，请使用Hg。我发现Git很难理解，而Hg很简单，并且与Windows+shell很好地集成在一起。我下载了Hg并关注了this+tutorial+(hginit.com)+--十分钟后，我有了一个本地存储库，并回到了我的项目中。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1776651|entityMap|0|LINK|mutability|MUTABLE|url|http://hginit.com/^0|2M|Q|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

If you are a Windows developer looking for basic disconnected revision control, go with Hg. I found Git to be incomprehensible while Hg was simple and well integrated with the Windows shell. I downloaded Hg and followed <a href="http://hginit.com/" rel="nofollow">this tutorial (hginit.com)</a> - ten minutes later I had a local repo and was back to work on my project.

blocks|key|1561524|text|您的项目中是否有基于Windows的合作者？|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1561525|因为如果有的话，Git-for-Windows+GUI就显得笨拙、困难、不友好了。|1561526|相比之下，Windows上的Mercurial是不需要动脑筋的。|1561527|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|H|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|I|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|J|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|G|$]]

Are there any Windows-based collaborators on your project?

Because if there are, the Git-for-Windows GUI seems awkward, difficult, unfriendly.

Mercurial-on-Windows, by contrast, is a no-brainer.

blocks|key|1776740|text|在bitbucket.org的mercurial和github的git之间需要注意的一件事是，mercurial可以有很多你想要的私有存储库，但github你必须升级到付费帐户。所以，这就是为什么我选择使用mercurial的bitbucket。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1776741|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

One thing to notice between mercurial of bitbucket.org and git of github is, mercurial can have as many private repositories as you want, but github you have to upgrade to a paid account. So, that's why I go for bitbucket which uses mercurial.

blocks|key|1561613|text|mercurial网站在两个系统之间有一个great+description+of+the+similarities+and+differences，解释了词汇表和基本概念的差异。作为一个长期使用git的人，它真的帮助我理解了善变的心态。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1561614|entityMap|0|LINK|mutability|MUTABLE|url|http://mercurial.selenic.com/wiki/GitConcepts^0|L|1H|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

The mercurial website has a <a href="http://mercurial.selenic.com/wiki/GitConcepts" rel="nofollow">great description of the similarities and differences</a> between the two systems, explaining the differences of vocabulary and underlying concepts. As a long time git user, it really helped my understand the Mercurial mindset.

blocks|key|1561670|text|如果要从SVN迁移，请使用Mercurial，因为SVN用户更容易理解它的语法。除此之外，使用这两种方法都不会出错。但在选择其中一个之前，一定要检查GIT+tutorial和HGinit。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1561671|entityMap|0|LINK|mutability|MUTABLE|url|http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html|1|http://hginit.com/^0|22|C|0|2F|6|1|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]|$A|R|B|S|1|T]]|C|$]]|$1|D|3|-4|5|6|7|U|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]|L|$5|G|H|I|C|$J|M]]]]

If you are migrating from SVN, use Mercurial as its syntax is MUCH more understandable for SVN users. Other than that, you can't go wrong with either. But do check <a href="http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html" rel="nofollow">GIT tutorial</a> and <a href="http://hginit.com/" rel="nofollow">HGinit</a> before selecting one of them.

blocks|key|1561717|text|此链接可帮助您了解http://www.techtatva.com/2010/09/git-mercurial-and-bazaar-a-comparison/的区别|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1561718|entityMap|0|LINK|mutability|MUTABLE|url|http://www.techtatva.com/2010/09/git-mercurial-and-bazaar-a-comparison/^0|9|1Z|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

This link may help you to understand the difference
<a href="http://www.techtatva.com/2010/09/git-mercurial-and-bazaar-a-comparison/" rel="nofollow">http://www.techtatva.com/2010/09/git-mercurial-and-bazaar-a-comparison/</a>

blocks|key|1776968|text|有些人认为VCS系统必须很复杂。他们鼓励在赛场上发明术语和概念。他们可能会认为，在这个主题上的许多博士将是有趣的。其中可能就有设计Git的人。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1776969|Mercurial是以一种不同的心态设计的。开发人员不应该太关心VCS，他们应该把时间花在他们的主要功能上:软件工程。Mercurial允许用户使用并愉快地滥用系统，而不会让他们犯任何不可恢复的错误。|1776970|任何专业工具都必须具有设计清晰且直观的CLI。Mercurial用户可以通过发出简单的命令来完成大部分工作，而不需要任何奇怪的选项。在Git+double+dash中，疯狂的选项是常态。如果您是CLI人员，Mercurial有很大的优势(老实说，任何有自尊的软件工程师都应该是)。|1776971|举个例子，假设您错误地执行了一次提交。您忘记编辑某些文件。要撤消Mercurial中的操作，只需键入：|1776972|$+hg+rollback|offset|length|style|CODE|1776973|然后，您会收到一条消息，提示系统撤消您的上一笔交易。|1776974|在Git中，你必须键入：|1776975|$+git+reset+--soft+HEAD%5E|1776976|所以好吧，假设你知道重置是怎么回事。但除此之外，你还必须知道什么是"--soft“和"--hard”重置(有什么直观的猜测吗？)当然，不要忘记最后的“%5E”字符！(现在Ritchie名下的是...)|1776977|Mercurial与第三方工具如kdiff3和meld的集成也要好得多。生成你的补丁，合并你的分支，不用大惊小怪。Mercurial还包括一个简单的http服务器，您可以通过键入以下命令激活该服务器|1776978|hg+serve|1776979|并让其他人浏览您的存储库。|1776980|底线是，Git做了Mercurial所做的事情，以一种复杂得多的方式，并且使用的CLI远远不如Mercurial。如果您想将项目的VCS转变为科学研究领域，请使用Git。如果您想在不太关心VCS工作的情况下完成VCS工作，并专注于您的实际任务，请使用Mercurial。|1776981|entityMap^0|0|0|0|0|0|D|0|0|0|0|O|0|0|0|0|8|0|0|0^^$0|@$1|2|3|4|5|6|7|15|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|16|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|17|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|18|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|19|8|@$J|1A|K|1B|L|M]]|9|@]|A|$]]|$1|N|3|O|5|6|7|1C|8|@]|9|@]|A|$]]|$1|P|3|Q|5|6|7|1D|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1E|8|@$J|1F|K|1G|L|M]]|9|@]|A|$]]|$1|T|3|U|5|6|7|1H|8|@]|9|@]|A|$]]|$1|V|3|W|5|6|7|1I|8|@]|9|@]|A|$]]|$1|X|3|Y|5|6|7|1J|8|@$J|1K|K|1L|L|M]]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1M|8|@]|9|@]|A|$]]|$1|11|3|12|5|6|7|1N|8|@]|9|@]|A|$]]|$1|13|3|-4|5|6|7|1O|8|@]|9|@]|A|$]]]|14|$]]

Some people think that VCS systems have to be complicated. They encourage inventing terms and concepts on the field. They would probably think that numerous PhDs on the subject would be interesting. Among those are probably the ones that designed Git.

Mercurial is designed with a different mentality. Developers should not care much about VCS, and they should instead spend their time on their main function: software engineering. Mercurial allows users to use and happily abuse the system without letting them make any non-recoverable mistakes. 

Any professional tool must come with a clearly designed and intuitive CLI. Mercurial users can do most of the work by issuing simple commands without any strange options. In Git double dash, crazy options are the norm. Mercurial has a substantial advantage if you are a CLI person (and to be honest, any self-respecting Software Engineer should be).

To give an example, suppose you do a commit by mistake. You forgot to edit some files. To undo you action in Mercurial you simply type:

<code> $ hg rollback </code>

You then get a message that the system undos your last transaction. 

In Git you have to type:

<code> $ git reset --soft HEAD^ </code>

So ok suppose you have an idea what reset is about. But in addition you have to know what "--soft" and "--hard" resets are (any intuitive guesses?). Oh and of course don't forget the '^' character in the end! (now what in Ritchie's name is that...)

Mercurial's integration with 3rd party tools like kdiff3 and meld is much better as well. Generate your patches merge your branches without much fuss. Mercurial also includes a simple http server that you activate by typing 

<code> hg serve </code>

And let others browse your repository.

The bottom line is, Git does what Mercurial does, in a much more complicated way and with a far inferior CLI. Use Git if you want to turn the VCS of your project into a scientific-research field. Use Mercurial if you want to get the VCS job done without caring much about it, and focus on your real tasks.

I've been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I've been looking at Mercurial (hg) and it looks interesting. However, I can't wrap my head around the differences between hg and git.

Has anyone made a side-by-side comparison between git and hg? I'm interested to know what differs hg and git without having to jump into a fanboy discussion.

What is the Difference Between Mercurial and Git?

我在Windows上(使用msysGit)使用git已经有一段时间了，我喜欢分布式源码控制的想法。就在最近，我一直在关注Mercurial，它看起来很有趣。然而，我无法理解hg和git之间的区别。有没有人对git和hg进行过并列比较？我很有兴趣知道hg和git有什么不同，而不必跳到粉丝的讨论中。

问Mercurial和Git有什么区别？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Mercurial和Git有什么区别？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Mercurial和Git有什么区别？
EN