zhaopingsun avatar zhaopingsun committed 6bb66c2

5.4.1 first 2 paras zh translated

Comments (0)

Files changed (1)

 "command> command, and the options it accepts, are similar to the <command "
 "role=\"hg-cmd\">hg copy</command> command."
 msgstr ""
+"<command role=\"hg-cmd\">hg remove</command>和<command role=\"hg-cmd\">hg "
+"copy</command>命令一样,你在事后可以使用<option role=\"hg-opt-rename\">--"
+"after</option>选项告诉Mercurial改名。大多数情况下,<command role=\"hg-cmd"
+"\">hg rename</command>和<command role=\"hg-cmd\">hg copy</command>的行为和接受"
+"的选项都是相似的。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:434
 "<command role=\"hg-cmd\">hg rename</command> command can be invoked as "
 "<command role=\"hg-cmd\">hg mv</command>."
 msgstr ""
-"如果你熟悉Unix命令行,那么告诉你一个好消息,可以用<command role=\"hg-cmd\">hg mv</"
-"command>替代<command role=\"hg-cmd\">hg rename</command>。"
+"如果你熟悉Unix命令行,那么告诉你一个好消息,可以用<command role=\"hg-cmd\">hg "
+"mv</command>替代<command role=\"hg-cmd\">hg rename</command>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:440
 "Since Mercurial's rename is implemented as copy-and-remove, the same "
 "propagation of changes happens when you merge after a rename as after a copy."
 msgstr ""
+"因为Mercurial的重命名是以拷贝删除的方式实现的,如果拷贝了一个文件,然后又将其"
+"重命名,变更还是会从原来的文件传播到更名后的文件。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:446
 "expect to <quote>simply work,</quote> but not all revision control systems "
 "actually do this.)"
 msgstr ""
+"如果我修改了一个文件,同时你又将其更名,然后我们合并相关变更,那么我在原始文件"
+"名下作的修改将会传播到你的新文件中去。(这个功能你可能认为<quote>很简单,</"
+"quote>但是不是所有的版本控制系统都有这个功能。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:453
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.