{"action":"created","comment":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/36054262","id":36054262,"diff_hunk":"@@ -330,18 +330,18 @@ No changes between 71af502c214ba13123992338569f4669877f55fd and refs/remotes/ori\n Resetting to the latest refs/remotes/origin/trunk\n ----\n \n-Running `dcommit` on a branch with merged history works fine, except that when you look at your Git project history, it hasn't rewritten either of the commits you made on the `experiment` branch – instead, all those changes appear in the SVN version of the single merge commit.\n+在一个有合并的分支上运行 `dcommit` 工作得很好，除了当你查看你的 Git 项目历史时，它并没有重写所有你在 `experiment` 分支上所做的任意提交 - 相反，所有这些修改在 SVN 版本中体现为一个单独的合并修改。\n \n-When someone else clones that work, all they see is the merge commit with all the work squashed into it, as though you ran `git merge --squash`; they don't see the commit data about where it came from or when it was committed.\n+当其他人克隆那些工作时，所有他们看到的是所有的工作被压缩到一次合并提交中，就像运行了 `git merge --squash`；他们无法看到修改从哪来或何时提交的信息。","path":"book/09-git-and-other-scms/sections/client-svn.asc","position":312,"original_position":312,"commit_id":"2b522a43b86d3a4e754cda955eca75060a8f72f4","original_commit_id":"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},"body":"当其他人克隆那些工作时，他们只会看到一个被塞入了所有改动的合并提交，就像运行了 `git merge --squash`；他们无法看到修改从哪来或何时提交的信息。\r\n\r\n我认为最后一句还是不改动较能体现出真实的意思。","created_at":"2015-08-03T03:40:03Z","updated_at":"2015-08-03T03:40:03Z","html_url":"https://github.com/progit/progit2-zh/pull/175#discussion_r36054262","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/36054262"},"html":{"href":"https://github.com/progit/progit2-zh/pull/175#discussion_r36054262"},"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-08-03T03:40:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"84772a69d3e9b1c04f4072bf1a5d3f29e1ef9bf2","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":47,"closed_issues":8,"state":"open","created_at":"2015-07-29T06:50:16Z","updated_at":"2015-08-03T02:19:43Z","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-08-03T03:10:28Z","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-08-02T09:18:55Z","pushed_at":"2015-08-03T03:10:28Z","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":292,"watchers_count":292,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":101,"mirror_url":null,"open_issues_count":64,"forks":101,"open_issues":64,"watchers":292,"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"}}}}