Mercurial > hgbook
comparison en/ch03-concepts.xml @ 775:29f0f79cf614
Update paragraph IDs
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 16 Apr 2009 23:46:45 -0700 |
| parents | b338f5490029 |
| children | 477d6a3e5023 |
comparison
equal
deleted
inserted
replaced
| 774:e6c99cbd0abd | 775:29f0f79cf614 |
|---|---|
| 522 </sect2> | 522 </sect2> |
| 523 | 523 |
| 524 <sect2> | 524 <sect2> |
| 525 <title>Merging and renames</title> | 525 <title>Merging and renames</title> |
| 526 | 526 |
| 527 <para>A surprising number of revision control systems pay little | 527 <para id="x_69a">A surprising number of revision control systems pay little |
| 528 or no attention to a file's <emphasis>name</emphasis> over | 528 or no attention to a file's <emphasis>name</emphasis> over |
| 529 time. For instance, it used to be common that if a file got | 529 time. For instance, it used to be common that if a file got |
| 530 renamed on one side of a merge, the changes from the other | 530 renamed on one side of a merge, the changes from the other |
| 531 side would be silently dropped.</para> | 531 side would be silently dropped.</para> |
| 532 | 532 |
| 533 <para>Mercurial records metadata when you tell it to perform a | 533 <para id="x_69b">Mercurial records metadata when you tell it to perform a |
| 534 rename or copy. It uses this metadata during a merge to do the | 534 rename or copy. It uses this metadata during a merge to do the |
| 535 right thing in the case of a merge. For instance, if I rename | 535 right thing in the case of a merge. For instance, if I rename |
| 536 a file, and you edit it without renaming it, when we merge our | 536 a file, and you edit it without renaming it, when we merge our |
| 537 work the file will be renamed and have your edits | 537 work the file will be renamed and have your edits |
| 538 applied.</para> | 538 applied.</para> |