如何安装Mercurial?

如果你在Linux上从源代码安装，或者使用Windows安装程序，请正确编辑。

Mac OS X 10.4 (Tiger)， 10.5 (Leopard)

使用Python的easy_install(带Setuptools):

sudo easy_install mercurial

它会找到最新的版本(撰写本文时为1.3.1)并安装在:

/Library/Frameworks/Python.framework/Versions/2.6/bin/

使用Python 2.6，这也解决了Mercurial OS X安装包(2009年7月26日为1.2.1)抱怨它需要Python 2.5的问题。从文档中可以看出，Fink和Macports安装的是1.2版本。

Linux

大多数显式Linux包似乎落后于当前版本，因此使用easy_install(如上所述)或下载Mercurial tarball，提取存档，切换到Mercurial目录，并运行:

$ make
$ sudo make install    # do a system-wide install
$ hg debuginstall      # sanity check
$ hg                   # see help

(来自介绍Mercurial，一个分布式版本控制系统)

窗户

有一个Mercurial最新版本的二进制包。TortoiseHg是一个用于安装Mercurial的Windows shell扩展。Cygwin也可以安装Mercurial。

或者(说明太长，所以在这里链接)，您可以从源代码构建一个优化或纯Python版本的Mercurial。

如何提交更改?

$ hg commit -m "Commit message"

如何比较一个文件的两个版本，或者您当前的文件和以前的版本?

两者都使用hg diff。当使用hg diff时，工作副本中的所有更改和提示(最新提交)都会显示出来。

对于“如何比较文件的两个修订版?”

$ hg diff -r{rev1} -r{rev2} {file.code}

上面的命令将显示“file.code”的rev1和rev2之间的不同。

对于“如何比较您当前的文件和以前的版本?”

$ hg diff {file.code}

上面的命令将显示不同的“文件”的当前版本。代码”和最新的修订(最新提交的)。

:D

如何合并分支?

$ cd repository-where-i-want-to merge
$ hg pull branch-i-want-to-merge
$ hg merge # if necessary

如何从存储库中删除文件?

从存储库中删除一个文件，并在下次提交时删除它:

$ hg remove {file(s)}

从存储库中删除文件，但不删除该文件

$ hg remove -Af {file(s)}

或从Mercurial 1.3

$ hg forget {file(s)}

如何与Subversion交互?

有三种方法:

---

convert扩展将把一个现有的Subversion存储库克隆为一个Mercurial存储库。它是Mercurial公司提供的。它的工作原理大致如下:

hg convert <Subversion URL or directory> <path to new Mercurial repository>

例如，这将获取SixApart memcached存储库的主干。

hg convert http://code.sixapart.com/svn/memcached/trunk

扩展可以增量地将新修订从Subversion存储库引入Mercurial存储库(有点像pull)。但是，它不支持获取Mercurial的修订并将它们发送回Subversion(不推送)。[XXX:如有错误请纠正]。

---

The hgsubversion extension. It is in many ways the most sophisticated solution as it uses the Subversion API to communicate with the Subversion repository. It aims to become the hg-svn bridge. It allow full round-tripping of revisions (full clone, pull, and push), However as of this writing [XXX: Amend this if/when it becomes incorrect] it is still in development and there are not yet official releases. As a consequence it works with only the most up-to-date Mercurial (1.3 as of this writing).

It maps tags and branches (preceding all tags with tags/ to distinguish them from equivalently named branches). It maintains a special branch closed-branches for closing off branches which are removed in Subversion. It requires that the Subversion repository be laid out according to the convention of trunk/branches/tags. The command set is typically hg svn <subcommand> though it aims at being integrated to the point that you don't need the 'svn' part (i.e. it wants to treat a Subversion clone as much as possible like any other Mercurial repository).;

它是这样工作的:

克隆:

hg svnclone <Subversion URL> 

OR(仅适用于svn:// url)

hg clone <svn:// URL>

拉:

hg svn pull

推动:

hg svn push

输入:

hg svn incoming

输出:

hg svn outgoing

检查整个存储库:

hg svnclone http://code.sixapart.com/svn/memcached

---

hgsvn实用程序(位桶树)。直到最近，这只允许您克隆和提取Subversion存储库，但从hgsvn 0.1.7开始，它支持推送。我不知道它推力有多大。任何有经验的人都应该更新这个。它有以下显著特点:

It generates a Mercurial tag for every SVN tag. It puts a local tag on every changeset to mark its SVN revision. It puts every Mercurial revision on a named branch named after its SVN branch. For example branches/some-feature would be like hg branch some-feature. It puts the trunk on trunk (i.e. nothing is on the Mercurial default branch, unless the user explicitly switches to it.) It will try to identify branches and tags, and create them but if it can't it just skips them. This is handy when the Subversion repository is not following the conventional trunk/branches/tags layout.

它是这样工作的:

克隆:

hgimportsvn <Subversion URL>

拉:

hgpullsvn

推动:

hgpushsvn

输入:

hgpullsvn -n

输出:

hgpushsvn -n

检查整个存储库:

hgimportsvn http://code.sixapart.com/svn/memcached

检查只是后备箱:

hgimportsvn http://code.sixapart.com/svn/memcached/trunk