# HG changeset patch # User drak@kaverne # Date 1411030605 -7200 # Node ID 4c185817cc45b43ab249cabb351eeada58d7b92a # Parent 38f7971e54a9610831926cd86314931015a81c4a Describe the canonical way to track folders: .keep files. diff -r 38f7971e54a9 -r 4c185817cc45 templates/guide/index.html --- a/templates/guide/index.html Thu Sep 18 10:56:20 2014 +0200 +++ b/templates/guide/index.html Thu Sep 18 10:56:45 2014 +0200 @@ -583,6 +583,21 @@ 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"). + +
+

Note: Tracking empty folders

+ +If you need empty folders which are available after clone, add +a .keep file in the folder and add that. + +
$ mkdir emptyfolder
+$ touch emptyfolder/.keep
+$ hg add emptyfolder/.keep
+$ hg commit -m "ensure that emptyfolder is available." emptyfolder/.keep
+
+
+
+
Rollback mistakes

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 commit or pull: rollback.