zhaopingsun avatar zhaopingsun committed 96fa11f

5.3.2 first 2 paras zh translated

Comments (0)

Files changed (1)

 "This behavior&emdash;of changes to a file propagating out to copies of the "
 "file&emdash;might seem esoteric, but in most cases it's highly desirable."
 msgstr ""
+"这一行为&emdash;文件的变更会传递到它的拷贝中&emdash; 可能看起来难以理解, 但在"
+"大多数情况下,它很受欢迎。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:286
 "a file, and subsequently modify the original file during the normal course of "
 "your work, nothing will happen."
 msgstr ""
+"首先要记住这种传播<emphasis>仅仅</emphasis>发生在合并的时候。所以如果你用"
+"<command role=\"hg-cmd\">hg copy</command>拷贝了一个文件,此后在工作过程这原文"
+"件进行了修改,这时什么也不会发生。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:292
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.