zhaopingsun avatar zhaopingsun committed aed0e93

2.8.1 zh translation

Comments (0)

Files changed (1)

 "more changes than you saw when using <command role=\"hg-cmd\">hg incoming</"
 "command>."
 msgstr ""
+"因为在运行<command role=\"hg-cmd\">hg incoming</command>和<command role=\"hg-"
+"cmd\">hg pull</command>之间可能存在延时,你可能不能看到从其他版本库中的所有导入"
+"进来的变更集。假如你正在通过网络从其他地方的版本库拖变更。当你查看<command "
+"role=\"hg-cmd\">hg incoming</command>的输出,还没有拖这些变更的时候,其他人向"
+"这个版本库提交了一些东西。这意味着你可能拖进来比你用<command role=\"hg-cmd"
+"\">hg incoming</command>看见的多的变更。"
 
 #. type: Content of: <book><chapter><sect1><sect2><tip><para>
 #: ../en/ch02-tour-basic.xml:824
 "a subset of changes, simply identify the change that you want to pull by its "
 "changeset ID, e.g. <command>hg pull -r7e95bb</command>."
 msgstr ""
+"如果你仅希望将<command role=\"hg-cmd\">hg incoming</command>命令列出的变更拖进"
+"来,或者由于其他原因希望得到变更的一个子集,那么你可以明确的指定变更集的ID,比"
+"如<command>hg pull -r7e95bb</command>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:834
 "opt-pull\">-u</option>, you can see that it printed a helpful reminder that "
 "we'd have to take an explicit step to update the working directory."
 msgstr ""
+"如果你回过头去看看在<xref linkend=\"sec:tour:pull\"/>一节中,我们运行<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:872
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.