zhaopingsun avatar zhaopingsun committed ddd97fa

2.8.3 zh translated

Comments (0)

Files changed (1)

 "update its working directory while someone was working in it, their work "
 "would be disrupted."
 msgstr ""
+"与<command role=\"hg-cmd\">hg pull</command>一样,在变更推送之后,<command "
+"role=\"hg-cmd\">hg push</command>命令并不会更新版本库的工作目录,与<command "
+"role=\"hg-cmd\">hg pull</command>命令不同,<command role=\"hg-cmd\">hg push</"
+"command>并不提供<literal>-u</literal>选项来更新其他版本库的工作目录。这一不对"
+"称是有目的的:我们推送的版本库可能是一个远端的服务器,并且很多人共享使用它。如"
+"果在其他人正在工作的时候,我们更新了工作目录,那么他们的工作很可能被破坏。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:934
 "What happens if we try to pull or push changes and the receiving repository "
 "already has those changes? Nothing too exciting."
 msgstr ""
+"如果我们向一个已经包含了这些变更的版本库推送或者拉这些变更会发生什么事情呢?,"
+"什么也不会发生。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:942
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.