Commits

zhaopingsun committed 9c84da5

2.8.2 4 paras zh translated

Comments (0)

Files changed (1)

 "not (by default) touch the working directory.  Instead, we use the <command "
 "role=\"hg-cmd\">hg update</command> command to do this."
 msgstr ""
+"现在我们已经对版本库和它的工作目录之间的关系有了粗略的了解。我们在<xref "
+"linkend=\"sec:tour:pull\"/>一节运行的<command role=\"hg-cmd\">hg pull</"
+"command>命令会将变更拖进版本库,但是如果我们检查一下的话,就会发现工作目录并没"
+"有变化。这是因为<command role=\"hg-cmd\">hg pull</command>命令并不会影响工作目"
+"录。实际上,我们需要<command role=\"hg-cmd\">hg update</command>命令来完成这个"
+"工作。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:848
 "automatically updated the working directory to a new revision, you might not "
 "be terribly happy."
 msgstr ""
+"<command role=\"hg-cmd\">hg pull</command>命令并不会自动更新工作目录,这看起来"
+"有点奇怪。但实际上这样做是有原因的:你可以用<command role=\"hg-cmd\">hg "
+"update</command>来更新工作目录,切换到版本库中的任意一个版本。假设你将工作目录"
+"切换到一个老的版本&emdash;假如说是为了追踪一个bug&emdash;然后运行了<command "
+"role=\"hg-cmd\">hg pull</command>命令。它自动将工作目录更新到新版本,这可能并"
+"不是你想要的结果。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:860
 "lets you combine the two by passing the <option role=\"hg-opt-pull\">-u</"
 "option> option to <command role=\"hg-cmd\">hg pull</command>."
 msgstr ""
+"因为拖然后更新是个非常常用的操作顺序,Mercurial允许你将这两个操作组合在一起,"
+"只要给<command role=\"hg-cmd\">hg pull</command>命令加上<option role=\"hg-opt-"
+"pull\">-u</option>选项就可以了。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:865
 "To find out what revision the working directory is at, use the <command role="
 "\"hg-cmd\">hg parents</command> command."
 msgstr ""
+"如果想知道工作目录的版本,可以使用<command role=\"hg-cmd\">hg parents</"
+"command>命令。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:878
 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> "
 "command."
 msgstr ""
+"如果需要将工作目录切换到一个特定版本,给<command role=\"hg-cmd\">hg update</"
+"command>命令加上版本号或者变更集标识符就可以了。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:893
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.