Mercurial > hg-website
comparison templates/guide/index.html @ 417:4c185817cc45
Describe the canonical way to track folders: .keep files.
| author | drak@kaverne |
|---|---|
| date | Thu, 18 Sep 2014 10:56:45 +0200 |
| parents | 38f7971e54a9 |
| children | 005d07dfce2b |
comparison
equal
deleted
inserted
replaced
| 416:38f7971e54a9 | 417:4c185817cc45 |
|---|---|
| 579 <p>You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your files at home and at work, or between your desktop and your laptop.</p> | 579 <p>You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your files at home and at work, or between your desktop and your laptop.</p> |
| 580 | 580 |
| 581 <div class="note"> | 581 <div class="note"> |
| 582 <p class="note-title">Note:</p> | 582 <p class="note-title">Note:</p> |
| 583 You also have to commit after a merge when there are no conflicts, because merging creates new history and you might want to attach a specific message to the merge (like "merge feature1"). | 583 You also have to commit after a merge when there are no conflicts, because merging creates new history and you might want to attach a specific message to the merge (like "merge feature1"). |
| 584 </div> | |
| 585 | |
| 586 | |
| 587 <div class="note"> | |
| 588 <p class="note-title">Note: Tracking empty folders</p> | |
| 589 | |
| 590 If you need empty folders which are available after clone, add | |
| 591 a <code>.keep</code> file in the folder and add that. | |
| 592 | |
| 593 <pre>$ mkdir emptyfolder | |
| 594 $ touch emptyfolder/.keep | |
| 595 $ hg add emptyfolder/.keep | |
| 596 $ hg commit -m "ensure that emptyfolder is available." emptyfolder/.keep | |
| 597 | |
| 598 </pre> | |
| 584 </div> | 599 </div> |
| 585 | 600 |
| 586 <h5>Rollback mistakes</h5> | 601 <h5>Rollback mistakes</h5> |
| 587 | 602 |
| 588 <p>Now you can work on different features in parallel, but from time to time a bad commit might sneak in. Naturally you could then just go back one revision and merge the stray error, keeping all mistakes out of the merged revision. However, there's an easier way, if you realize your error before you do another <em>commit</em> or <em>pull</em>: <em>rollback</em>.</p> | 603 <p>Now you can work on different features in parallel, but from time to time a bad commit might sneak in. Naturally you could then just go back one revision and merge the stray error, keeping all mistakes out of the merged revision. However, there's an easier way, if you realize your error before you do another <em>commit</em> or <em>pull</em>: <em>rollback</em>.</p> |