Fossil SCM
Update the FAQ to describe the new --private option on the commit command.
Commit
85c6542a1614069f5c2f1279b07a65fb0c4f1fb1
Parent
02a584f7f5e5880…
1 file changed
+18
-5
+18
-5
| --- www/faq.wiki | ||
| +++ www/faq.wiki | ||
| @@ -64,13 +64,26 @@ | ||
| 64 | 64 | |
| 65 | 65 | <a name="q4"></a> |
| 66 | 66 | <p><b>(4) How do I create a private branch that won't get pushed back to the |
| 67 | 67 | main repository.</b></p> |
| 68 | 68 | |
| 69 | -<blockquote>You cannot. All branches in fossil are public in the sense that | |
| 70 | -are all pushed and pulled together. There is no way to tell fossil | |
| 71 | -to only push or pull a subset of branches. | |
| 69 | +<blockquote>Use the <b>--private</b> command-line option on the | |
| 70 | +<b>commit</b> command. The result will be a check-in which exists on | |
| 71 | +your local repository only and is never pushed to other repositories. | |
| 72 | +All descendents of a private check-in are also private. | |
| 73 | + | |
| 74 | +Unless you specify something different using the <b>--branch</b> and/or | |
| 75 | +<b>--bgcolor</b> options, the new private check-in will be put on a branch | |
| 76 | +named "private" with an orange background color. | |
| 72 | 77 | |
| 73 | -Of course, as long as you never push, you can make as many private | |
| 74 | -changes as you want.</blockquote></li> | |
| 78 | +You can merge from the trunk into your private branch in order to keep | |
| 79 | +your private branch in sync with the latest changes on the trunk. Once | |
| 80 | +you have everything in your private branch the way you want it, you can | |
| 81 | +then merge your private branch back into the trunk and push. Only the | |
| 82 | +final merge operation will appear in other repositories. It will appear | |
| 83 | +as if all the changes that occurred on your private branch occurred in | |
| 84 | +a single check-in. | |
| 85 | +Of course, you can also keep your private branch private forever simply | |
| 86 | +by not merging the changes in the private branch back into the trunk. | |
| 87 | +</blockquote></li> | |
| 75 | 88 | |
| 76 | 89 | </ol> |
| 77 | 90 |
| --- www/faq.wiki | |
| +++ www/faq.wiki | |
| @@ -64,13 +64,26 @@ | |
| 64 | |
| 65 | <a name="q4"></a> |
| 66 | <p><b>(4) How do I create a private branch that won't get pushed back to the |
| 67 | main repository.</b></p> |
| 68 | |
| 69 | <blockquote>You cannot. All branches in fossil are public in the sense that |
| 70 | are all pushed and pulled together. There is no way to tell fossil |
| 71 | to only push or pull a subset of branches. |
| 72 | |
| 73 | Of course, as long as you never push, you can make as many private |
| 74 | changes as you want.</blockquote></li> |
| 75 | |
| 76 | </ol> |
| 77 |
| --- www/faq.wiki | |
| +++ www/faq.wiki | |
| @@ -64,13 +64,26 @@ | |
| 64 | |
| 65 | <a name="q4"></a> |
| 66 | <p><b>(4) How do I create a private branch that won't get pushed back to the |
| 67 | main repository.</b></p> |
| 68 | |
| 69 | <blockquote>Use the <b>--private</b> command-line option on the |
| 70 | <b>commit</b> command. The result will be a check-in which exists on |
| 71 | your local repository only and is never pushed to other repositories. |
| 72 | All descendents of a private check-in are also private. |
| 73 | |
| 74 | Unless you specify something different using the <b>--branch</b> and/or |
| 75 | <b>--bgcolor</b> options, the new private check-in will be put on a branch |
| 76 | named "private" with an orange background color. |
| 77 | |
| 78 | You can merge from the trunk into your private branch in order to keep |
| 79 | your private branch in sync with the latest changes on the trunk. Once |
| 80 | you have everything in your private branch the way you want it, you can |
| 81 | then merge your private branch back into the trunk and push. Only the |
| 82 | final merge operation will appear in other repositories. It will appear |
| 83 | as if all the changes that occurred on your private branch occurred in |
| 84 | a single check-in. |
| 85 | Of course, you can also keep your private branch private forever simply |
| 86 | by not merging the changes in the private branch back into the trunk. |
| 87 | </blockquote></li> |
| 88 | |
| 89 | </ol> |
| 90 |