如何与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

如何获得最新的代码?

Mercurial会记住存储库是从哪里克隆的(在.hg/hgrc中)，所以你可以简单地运行:

hg pull

从原始存储库中提取最新的代码。(这不会更新工作目录)

hg update

更新工作目录。

hg pull -u

同时执行拉取和更新。

你如何分支?

$ hg分支我的分支

or

复制my-branch

尽管需要注意的是，branch创建了一个“虚拟”目录(即文件保持不变，但hg将它们视为系统内部的不同文件)，而clone创建了一个实际的、完整的副本。严格来说，克隆并不是分支。

如何恢复变更集?

有几个选项

简单方法(撤销单个更改集)

$ hg backout -m 'back out second change' tip
reverting myfile
changeset 2:01adc4672142 backs out changeset 1:7e341ee3be7a
$ cat myfile
first change

Hard Way(手动区分和应用)

步骤1:创建一个补丁文件来恢复版本107和108之间的更改:

hg diff -r107 -r108 --reverse  > revert-change.patch

(或者，hg diff -r108 -r107加上no——reverse也会做同样的事情)

第二步:应用补丁文件:

patch -p1 < revert-change.patch

有些差异可能不适用，例如:

Hunk #3 FAILED at 517.
1 out of 3 hunks FAILED -- saving rejects to file 'foo/bar.c.rej'

.rej文件将包含应用失败的diff的内容，您需要查看一下。

如何提交更改?

$ hg commit -m "Commit message"

好的GUI/IDE插件Mercurial?

GUI

TortoiseHg for just about any OS. Includes Windows Explorer integration. It also works in Linux and a few other OS:es including Max OS X. It has a somewhat clunky interface and is a little awkard to use at first, but it is very complete and powerful. Murky runs on Mac OS X 10.5 or later. Murky is good for exploring the repository and basic commands, but you will need to know how to use the command line as well. MacHg is a nice Mac OS X Gui that has a little more functionality and polish than Murky, but you will still need the command line with it as well. SourceTree is a Mac client originally, with a Windows version available just recently. Pretty nice UI (at least on OS X), supports majority of Hg features, including shelve.

插件

VisualHG for Visual Studio HgSccPackage for Visual Studio 2008/2010 mercuraleclipse for Eclipse 对NetBeans的Mercurial支持 Mercurial对Sublime Text的支持