Mercurial初学者:最终实用指南

灵感来自Git初学者:权威的实用指南。

这是一个关于初学者实际使用Mercurial的信息汇编。

初学者——一个接触过源代码控制却没有很好地理解它的程序员。

实用——涵盖大多数用户经常遇到的情况——创建存储库、分支、合并、从远程存储库拉/推到远程存储库等等。

注: 解释如何完成某件事，而不是解释某件事是怎样的实现的。回答一个问题。回答清楚，尽可能简洁。上编辑/扩展现有答案，而不是创建新答案同样的话题。请为想了解更多的人提供Mercurial wiki或HG Book的链接。

问题:

安装/设置

如何安装Mercurial? 如何设置Mercurial? 如何创建一个新的项目/存储库? 如何将其配置为忽略文件?

使用代码

How do you get the latest code? How do you check out code? How do you commit changes? How do you see what's uncommitted, or the status of your current codebase? How do you remove files from the repository? How do you destroy unwanted commits? How do you compare two revisions of a file, or your current file and a previous revision? How do you see the history of revisions to a file or repository? How do you handle binary files (visio docs, for instance, or compiler environments)? How do you merge files changed at the "same time"? How do you revert a Changeset? How do you go back to a previous version of the code? How do you extract a patch from a specific changeset? How do you record that you renamed or deleted a file without using the Mercurial command?

标记、分支、发布、基线

你如何“标记”、“标记”或“发布”一组特定文件的特定修订，以便以后总是可以提取它? 你如何进行特定的“释放”? 你如何分支? 如何合并分支? 如何将一个分支的部分合并到另一个分支中?

其他

好的GUI/IDE插件Mercurial?优点/缺点? 还有其他初学者应该知道的常见任务吗? 如何与Subversion交互?

其他Mercurial参考资料

Mercurial:权威指南 Mercurial维基满足Mercurial |偷窥码屏幕播放掌握Mercurial | TekPub屏幕播放 Hg初始化-接地水银教程

当前回答

好的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的支持

2009-10-11 19:39:14

其他回答

如何获得最新的代码?

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

hg pull

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

hg update

更新工作目录。

hg pull -u

同时执行拉取和更新。

2009-08-09 15:33:26

如何签出代码?

hg clone [OPTION]... SOURCE [DEST]

选项为:

 -U --noupdate      the clone will only contain a repository (no working copy)
 -r --rev           a changeset you would like to have after cloning
    --pull          use pull protocol to copy metadata
    --uncompressed  use uncompressed transfer (fast over LAN)
 -e --ssh           specify ssh command to use
    --remotecmd     specify hg command to run on the remote side

其中source是存储库中原始文件的源，可以是远程URL或文件系统目录。例如:

http://bitbucket.org/scrum8/django-wmd-editor/ /home/username/repository/django-wmd-editor / ssh: / / myusername@scrum8.com/ ~ /仓库/ django-wmd-editor /

destination是源代码在本地文件系统中的位置。

2009-09-07 01:25:52

如何恢复变更集?

有几个选项

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

$ 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的内容，您需要查看一下。

2010-07-28 13:54:28

如何提交更改?

从当前本地* mercurial存储库调用此命令

hg commit [OPTION]... [FILE]...

别名：CI

本地mercurial存储库的当前目录中有.hg

选项为:

 -A --addremove     mark new/missing files as added/removed before committing
    --close-branch  mark a branch as closed, hiding it from the branch list
 -I --include       include names matching the given patterns
 -X --exclude       exclude names matching the given patterns
 -m --message       use <text> as commit message
 -l --logfile       read commit message from <file>
 -d --date          record datecode as commit date
 -u --user          record user as committer

一个示例命令是:

hg commit -m "added readme" README

注:

如果省略了一个文件列表，所有由"hg status"报告的更改都将被提交。如果提交合并的结果，不要提供任何文件名或-I/-X过滤器。如果未指定提交消息，则启动已配置的编辑器以提示您输入消息。

2009-09-07 01:46:23

如何设置Mercurial?

Mercurial将其配置信息存储在~/中。*nix系统为%UserProfile%\ mercury .ini, Windows系统为%UserProfile%\ mercury .ini。(%UserProfile%在Windows 2000或Windows XP系统上通常是“C:\Documents and Settings\[username]\”，在Windows Vista和Windows 7系统上通常是C:\ users \[username]\)

首先，你应该在你的.hgrc或mercury .ini中设置你的Mercurial用户名:

# This is a Mercurial configuration file.
[ui]
username = Firstname Lastname <email.address@example.net>

Windows系统上的TortoiseHg用户也可以执行hgtk userconfig命令

参见“Mercurial:权威指南”第2章中的“创建Mercurial配置文件”。

2009-09-09 20:55:29

Mercurial初学者:最终实用指南

推荐文章

最新文章

标签