zhaopingsun avatar zhaopingsun committed 6c93d64

5.4.0 4th para zh translated

Comments (0)

Files changed (1)

 "have made up until that point.  (I find this behavior a little "
 "counterintuitive, which is why I mention it here.)"
 msgstr ""
-"在使用<command role=\"hg-cmd\">hg copy</command>命令的时候,Mercurial会将在当"
-"前工作目录中的文件复制。也就是说,如果你对文件作了修改,并且没有提交,那么"
+"在使用<command role=\"hg-cmd\">hg copy</command>命令的时候,Mercurial会复制工"
+"作目录中当前的文件。也就是说,如果你对文件作了修改,并且没有提交,那么"
 "<command role=\"hg-cmd\">hg copy</command>生成的新的文件将包含这些修改。(我觉"
 "得这样有点不合常理,所以在这里提一下。)"
 
 "\"hg-cmd\">hg status</command> to see that the added file is really being "
 "tracked by Mercurial as a copy of the original, now removed, file."
 msgstr ""
+"和<command role=\"hg-cmd\">hg copy</command>命令的结果一样,我们必须给"
+"<command role=\"hg-cmd\">hg status</command>命令加上<option role=\"hg-opt-"
+"status\">-C</option>选项才能看到Mercurial是将新加的文件是作为原始文件的拷贝进"
+"行管理的,同时原始文件已经删除。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:425
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.