{"action":"created","comment":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/35858669","id":35858669,"diff_hunk":"@@ -1,38 +1,38 @@\n [[_git_svn]]\n-==== Git and Subversion\n+==== Git 与 Subversion\n \n (((Subversion)))(((Interoperation with other VCSs, Subversion)))\n-A large fraction of open source development projects and a good number of corporate projects use Subversion to manage their source code.\n-It's been around for more than a decade, and for most of that time was the _de facto_ VCS choice for open-source projects.\n-It's also very similar in many ways to CVS, which was the big boy of the source-control world before that.\n+很大一部分开源项目与相当多的企业项目使用 Subversion 来管理它们的源代码。\n+它已经被广泛使用超过了十年，在大多数情况下它是开源项目的 _事实标准_ VCS 选择。\n+它在很多方面都与曾经是源代码管理世界的大人物的 CVS 相似。\n \n (((git commands, svn)))(((git-svn)))\n-One of Git's great features is a bidirectional bridge to Subversion called `git svn`.\n-This tool allows you to use Git as a valid client to a Subversion server, so you can use all the local features of Git and then push to a Subversion server as if you were using Subversion locally.\n-This means you can do local branching and merging, use the staging area, use rebasing and cherry-picking, and so on, while your collaborators continue to work in their dark and ancient ways.\n-It's a good way to sneak Git into the corporate environment and help your fellow developers become more efficient while you lobby to get the infrastructure changed to support Git fully.\n-The Subversion bridge is the gateway drug to the DVCS world.\n+Git 中最棒的一个特性就是有一个与 Subversion 的双向桥接，它被称作 `git svn`。\n+这个工具允许你使用 Git 作为连接到 Subversion 有效的客户端，这样你可以使用 Git 所有本地的功能然后如同正在本地使用 Subversion 一样推送到 Subversion 服务器。\n+这意味着你可以在本地新建分支与合并分支、使用暂存区、使用变基与拣选等等，同时协作者还可以继续使用他们黑暗又古老的方式。\n+一个好的方式是将 Git 潜入到公司环境然后帮助你的同伴开发者更高效的开发，同时游说将基础设施修改为完全支持 Git。\n+Subversion 桥接就是进入 DVCS 世界的大门。\n \n ===== `git svn`\n \n-The base command in Git for all the Subversion bridging commands is `git svn`.\n-It takes quite a few commands, so we'll show the most common while going through a few simple workflows.\n+在 Git 中所有 Subversion 桥接命令的基础命令是 `git svn`。\n+它需要很多参数，所以我们会通过几个简单的工作流程来为你演示最常用的命令。\n \n-It's important to note that when you're using `git svn`, you're interacting with Subversion, which is a system that works very differently from Git.\n-Although you *can* do local branching and merging, it's generally best to keep your history as linear as possible by rebasing your work, and avoiding doing things like simultaneously interacting with a Git remote repository.\n+需要特别注意的是当你使用 `git svn` 时，就是在与 Subversion 打交道，一个与 Git 完全不同的系统。\n+尽管 *可以* 在本地新建分支与合并分支，你最好还是通过变基你的工作来保证你的历史尽可能是直线，并且避免做类似同时与 Git 远程服务器交互的事情。\n \n-Don't rewrite your history and try to push again, and don't push to a parallel Git repository to collaborate with fellow Git developers at the same time.\n-Subversion can have only a single linear history, and confusing it is very easy.\n-If you're working with a team, and some are using SVN and others are using Git, make sure everyone is using the SVN server to collaborate – doing so will make your life easier.\n+不要重写你的历史然后尝试再次推送，同一时间也不要推送到一个平行的 Git 仓库来与其他使用 Git 的开发者协作。\n+Subversion 只能有一个线性的历史，弄乱它很容易。\n+如果你在一个团队中工作，其中有一些人使用 SVN 而另一些人使用 Git，你需要确保每个人都使用 SVN 服务器来协作 - 这样做会使你的生活更容易。\n \n-===== Setting Up\n+===== 设置\n \n-To demonstrate this functionality, you need a typical SVN repository that you have write access to.\n-If you want to copy these examples, you'll have to make a writeable copy of my test repository.\n-In order to do that easily, you can use a tool called `svnsync` that comes with Subversion.\n-For these tests, we created a new Subversion repository on Google Code that was a partial copy of the `protobuf` project, which is a tool that encodes structured data for network transmission.\n+为了演示这个功能，需要一个有写入权限的典型 SVN 仓库。\n+如果想要拷贝这些例子，你需要一个我的测试仓库的可写拷贝。\n+为了轻松地拷贝，可以使用 Subversion 自带的一个名为 `svnsync` 的工具。\n+为了这些测试，我们在 Google Code 上创建了一个 `protobuf` 项目部分拷贝的新 Subversion 仓库，`protobuf` 是一个编码网络传输的结构性数据的工具。","path":"book/09-git-and-other-scms/sections/client-svn.asc","position":54,"original_position":54,"commit_id":"2b522a43b86d3a4e754cda955eca75060a8f72f4","original_commit_id":"2b522a43b86d3a4e754cda955eca75060a8f72f4","user":{"login":"KevenYoung","id":2274547,"avatar_url":"https://avatars.githubusercontent.com/u/2274547?v=3","gravatar_id":"","url":"https://api.github.com/users/KevenYoung","html_url":"https://github.com/KevenYoung","followers_url":"https://api.github.com/users/KevenYoung/followers","following_url":"https://api.github.com/users/KevenYoung/following{/other_user}","gists_url":"https://api.github.com/users/KevenYoung/gists{/gist_id}","starred_url":"https://api.github.com/users/KevenYoung/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KevenYoung/subscriptions","organizations_url":"https://api.github.com/users/KevenYoung/orgs","repos_url":"https://api.github.com/users/KevenYoung/repos","events_url":"https://api.github.com/users/KevenYoung/events{/privacy}","received_events_url":"https://api.github.com/users/KevenYoung/received_events","type":"User","site_admin":false},"body":">`protobuf` 是一个编码网络传输的结构性数据的工具\r\n\r\n`protobuf` 是一个将结构性数据编码用于网络传输的工具","created_at":"2015-07-30T10:45:09Z","updated_at":"2015-07-30T10:45:09Z","html_url":"https://github.com/progit/progit2-zh/pull/175#discussion_r35858669","pull_request_url":"https://api.github.com/repos/progit/progit2-zh/pulls/175","_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/35858669"},"html":{"href":"https://github.com/progit/progit2-zh/pull/175#discussion_r35858669"},"pull_request":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/175"}}},"pull_request":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/175","id":39232545,"html_url":"https://github.com/progit/progit2-zh/pull/175","diff_url":"https://github.com/progit/progit2-zh/pull/175.diff","patch_url":"https://github.com/progit/progit2-zh/pull/175.patch","issue_url":"https://api.github.com/repos/progit/progit2-zh/issues/175","number":175,"state":"open","locked":false,"title":"Translate 09-git-and-other-scms client-svn v2","user":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-07-06T02:45:34Z","updated_at":"2015-07-30T10:45:09Z","closed_at":null,"merged_at":null,"merge_commit_sha":"782b5ddc78efbf6aaa94b801ca1912bd48869063","assignee":null,"milestone":{"url":"https://api.github.com/repos/progit/progit2-zh/milestones/1","html_url":"https://github.com/progit/progit2-zh/milestones/v1.0.0","labels_url":"https://api.github.com/repos/progit/progit2-zh/milestones/1/labels","id":1231002,"number":1,"title":"v1.0.0","description":"所有内容翻译完成并经过审校后合并入主干分支。","creator":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"open_issues":52,"closed_issues":3,"state":"open","created_at":"2015-07-29T06:50:16Z","updated_at":"2015-07-29T13:59:59Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/progit/progit2-zh/pulls/175/commits","review_comments_url":"https://api.github.com/repos/progit/progit2-zh/pulls/175/comments","review_comment_url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments{/number}","comments_url":"https://api.github.com/repos/progit/progit2-zh/issues/175/comments","statuses_url":"https://api.github.com/repos/progit/progit2-zh/statuses/2b522a43b86d3a4e754cda955eca75060a8f72f4","head":{"label":"networm:09-git-and-other-scms_client-svn","ref":"09-git-and-other-scms_client-svn","sha":"2b522a43b86d3a4e754cda955eca75060a8f72f4","user":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"repo":{"id":28445173,"name":"progit2-zh","full_name":"networm/progit2-zh","owner":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/networm/progit2-zh","description":"","fork":true,"url":"https://api.github.com/repos/networm/progit2-zh","forks_url":"https://api.github.com/repos/networm/progit2-zh/forks","keys_url":"https://api.github.com/repos/networm/progit2-zh/keys{/key_id}","collaborators_url":"https://api.github.com/repos/networm/progit2-zh/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/networm/progit2-zh/teams","hooks_url":"https://api.github.com/repos/networm/progit2-zh/hooks","issue_events_url":"https://api.github.com/repos/networm/progit2-zh/issues/events{/number}","events_url":"https://api.github.com/repos/networm/progit2-zh/events","assignees_url":"https://api.github.com/repos/networm/progit2-zh/assignees{/user}","branches_url":"https://api.github.com/repos/networm/progit2-zh/branches{/branch}","tags_url":"https://api.github.com/repos/networm/progit2-zh/tags","blobs_url":"https://api.github.com/repos/networm/progit2-zh/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/networm/progit2-zh/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/networm/progit2-zh/git/refs{/sha}","trees_url":"https://api.github.com/repos/networm/progit2-zh/git/trees{/sha}","statuses_url":"https://api.github.com/repos/networm/progit2-zh/statuses/{sha}","languages_url":"https://api.github.com/repos/networm/progit2-zh/languages","stargazers_url":"https://api.github.com/repos/networm/progit2-zh/stargazers","contributors_url":"https://api.github.com/repos/networm/progit2-zh/contributors","subscribers_url":"https://api.github.com/repos/networm/progit2-zh/subscribers","subscription_url":"https://api.github.com/repos/networm/progit2-zh/subscription","commits_url":"https://api.github.com/repos/networm/progit2-zh/commits{/sha}","git_commits_url":"https://api.github.com/repos/networm/progit2-zh/git/commits{/sha}","comments_url":"https://api.github.com/repos/networm/progit2-zh/comments{/number}","issue_comment_url":"https://api.github.com/repos/networm/progit2-zh/issues/comments{/number}","contents_url":"https://api.github.com/repos/networm/progit2-zh/contents/{+path}","compare_url":"https://api.github.com/repos/networm/progit2-zh/compare/{base}...{head}","merges_url":"https://api.github.com/repos/networm/progit2-zh/merges","archive_url":"https://api.github.com/repos/networm/progit2-zh/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/networm/progit2-zh/downloads","issues_url":"https://api.github.com/repos/networm/progit2-zh/issues{/number}","pulls_url":"https://api.github.com/repos/networm/progit2-zh/pulls{/number}","milestones_url":"https://api.github.com/repos/networm/progit2-zh/milestones{/number}","notifications_url":"https://api.github.com/repos/networm/progit2-zh/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/networm/progit2-zh/labels{/name}","releases_url":"https://api.github.com/repos/networm/progit2-zh/releases{/id}","created_at":"2014-12-24T10:12:38Z","updated_at":"2015-07-30T06:46:45Z","pushed_at":"2015-07-30T08:35:36Z","git_url":"git://github.com/networm/progit2-zh.git","ssh_url":"git@github.com:networm/progit2-zh.git","clone_url":"https://github.com/networm/progit2-zh.git","svn_url":"https://github.com/networm/progit2-zh","homepage":null,"size":160243,"stargazers_count":5,"watchers_count":5,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":0,"forks":2,"open_issues":0,"watchers":5,"default_branch":"master"}},"base":{"label":"progit:master","ref":"master","sha":"5d1559eefe4a24a1c1161fbcd1dda13f98941d16","user":{"login":"progit","id":95588,"avatar_url":"https://avatars.githubusercontent.com/u/95588?v=3","gravatar_id":"","url":"https://api.github.com/users/progit","html_url":"https://github.com/progit","followers_url":"https://api.github.com/users/progit/followers","following_url":"https://api.github.com/users/progit/following{/other_user}","gists_url":"https://api.github.com/users/progit/gists{/gist_id}","starred_url":"https://api.github.com/users/progit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit/subscriptions","organizations_url":"https://api.github.com/users/progit/orgs","repos_url":"https://api.github.com/users/progit/repos","events_url":"https://api.github.com/users/progit/events{/privacy}","received_events_url":"https://api.github.com/users/progit/received_events","type":"Organization","site_admin":false},"repo":{"id":26017730,"name":"progit2-zh","full_name":"progit/progit2-zh","owner":{"login":"progit","id":95588,"avatar_url":"https://avatars.githubusercontent.com/u/95588?v=3","gravatar_id":"","url":"https://api.github.com/users/progit","html_url":"https://github.com/progit","followers_url":"https://api.github.com/users/progit/followers","following_url":"https://api.github.com/users/progit/following{/other_user}","gists_url":"https://api.github.com/users/progit/gists{/gist_id}","starred_url":"https://api.github.com/users/progit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit/subscriptions","organizations_url":"https://api.github.com/users/progit/orgs","repos_url":"https://api.github.com/users/progit/repos","events_url":"https://api.github.com/users/progit/events{/privacy}","received_events_url":"https://api.github.com/users/progit/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/progit/progit2-zh","description":"","fork":false,"url":"https://api.github.com/repos/progit/progit2-zh","forks_url":"https://api.github.com/repos/progit/progit2-zh/forks","keys_url":"https://api.github.com/repos/progit/progit2-zh/keys{/key_id}","collaborators_url":"https://api.github.com/repos/progit/progit2-zh/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/progit/progit2-zh/teams","hooks_url":"https://api.github.com/repos/progit/progit2-zh/hooks","issue_events_url":"https://api.github.com/repos/progit/progit2-zh/issues/events{/number}","events_url":"https://api.github.com/repos/progit/progit2-zh/events","assignees_url":"https://api.github.com/repos/progit/progit2-zh/assignees{/user}","branches_url":"https://api.github.com/repos/progit/progit2-zh/branches{/branch}","tags_url":"https://api.github.com/repos/progit/progit2-zh/tags","blobs_url":"https://api.github.com/repos/progit/progit2-zh/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/progit/progit2-zh/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/progit/progit2-zh/git/refs{/sha}","trees_url":"https://api.github.com/repos/progit/progit2-zh/git/trees{/sha}","statuses_url":"https://api.github.com/repos/progit/progit2-zh/statuses/{sha}","languages_url":"https://api.github.com/repos/progit/progit2-zh/languages","stargazers_url":"https://api.github.com/repos/progit/progit2-zh/stargazers","contributors_url":"https://api.github.com/repos/progit/progit2-zh/contributors","subscribers_url":"https://api.github.com/repos/progit/progit2-zh/subscribers","subscription_url":"https://api.github.com/repos/progit/progit2-zh/subscription","commits_url":"https://api.github.com/repos/progit/progit2-zh/commits{/sha}","git_commits_url":"https://api.github.com/repos/progit/progit2-zh/git/commits{/sha}","comments_url":"https://api.github.com/repos/progit/progit2-zh/comments{/number}","issue_comment_url":"https://api.github.com/repos/progit/progit2-zh/issues/comments{/number}","contents_url":"https://api.github.com/repos/progit/progit2-zh/contents/{+path}","compare_url":"https://api.github.com/repos/progit/progit2-zh/compare/{base}...{head}","merges_url":"https://api.github.com/repos/progit/progit2-zh/merges","archive_url":"https://api.github.com/repos/progit/progit2-zh/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/progit/progit2-zh/downloads","issues_url":"https://api.github.com/repos/progit/progit2-zh/issues{/number}","pulls_url":"https://api.github.com/repos/progit/progit2-zh/pulls{/number}","milestones_url":"https://api.github.com/repos/progit/progit2-zh/milestones{/number}","notifications_url":"https://api.github.com/repos/progit/progit2-zh/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/progit/progit2-zh/labels{/name}","releases_url":"https://api.github.com/repos/progit/progit2-zh/releases{/id}","created_at":"2014-10-31T13:43:10Z","updated_at":"2015-07-30T08:58:25Z","pushed_at":"2015-07-30T09:42:50Z","git_url":"git://github.com/progit/progit2-zh.git","ssh_url":"git@github.com:progit/progit2-zh.git","clone_url":"https://github.com/progit/progit2-zh.git","svn_url":"https://github.com/progit/progit2-zh","homepage":null,"size":162479,"stargazers_count":285,"watchers_count":285,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":101,"mirror_url":null,"open_issues_count":72,"forks":101,"open_issues":72,"watchers":285,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/175"},"html":{"href":"https://github.com/progit/progit2-zh/pull/175"},"issue":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/175"},"comments":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/175/comments"},"review_comments":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/175/comments"},"review_comment":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/175/commits"},"statuses":{"href":"https://api.github.com/repos/progit/progit2-zh/statuses/2b522a43b86d3a4e754cda955eca75060a8f72f4"}}}}