Translate 09-git-and-other-scms client-hg v2 #176
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| The good news, if you prefer Git's client-side behavior but are working with a project whose source code is controlled with Mercurial, is that there's a way to use Git as a client for a Mercurial-hosted repository. | ||
| Since the way Git talks to server repositories is through remotes, it should come as no surprise that this bridge is implemented as a remote helper. | ||
| The project's name is git-remote-hg, and it can be found at https://github.com/felipec/git-remote-hg[]. | ||
| 好消息，如果你偏好客户端使用 Git 行为但是工作在源代码由 Mercurial 控制的项目中，有一种使用 Git 作为 Mercurial 托管仓库的客户端的方法。 |
|
@networm 完成 |
|
@IceNature 已按照意见修改。 |
| In fact, there are many other systems in this space, each with their own angle on how to do distributed version control correctly. | ||
| Apart from Git, the most popular is Mercurial, and the two are very similar in many respects. | ||
| DVCS 的宇宙里不只有 Git。 | ||
| 实际上，在这个空间里有许多其他的系统，它们每一个都有它们自己的如何将分布式版本管理做正确的角度。 |
There was a problem hiding this comment.
对于如何正确地进行分布式版本管理，每一个系统都有自己的视角。
| Unlike the other systems we work with in this chapter, Mercurial is capable of handling merges, so we're not going to do anything fancy. | ||
| 因为使用了 `--all` 标记，我们看到被 git-remote-hg 内部使用的 ``notes'' 引用，但是可以忽略它们。 | ||
| 剩下的部分是我们期望的；`origin/master` 已经前进了一次提交，同时我们的历史现在分叉了。 | ||
| 并不像本章中我们工作的其他系统，Mercurial 有能力处理合并，所以我们不需要做任何想像的事情。 |
There was a problem hiding this comment.
Mercurial 和我们本章中讨论的其他系统不一样，它能够处理合并，所以我们不需要做任何其他事情。
|
@networm 审校完毕。 |
|
@secondwtq 已修正。 |
| In fact, there are many other systems in this space, each with their own angle on how to do distributed version control correctly. | ||
| Apart from Git, the most popular is Mercurial, and the two are very similar in many respects. | ||
| DVCS 的宇宙里不只有 Git。 | ||
| 实际上，在这个空间里有许多其他的系统，对于如何正确地进行分布式版本管理，每一个系统都有自己的视角。 |
|
@networm 已审核完毕，并提出 6 个修改意见。 |
|
@IceNature 已修正。 |
networm
added a commit
that referenced
this pull request
Aug 11, 2015
Translate 09-git-and-other-scms client-hg
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.