Fossil SCM
Update the Private Branches document to explain how to publish private branches (i.e. how to make them non-private), and mention why the --integrate option is ignored when merging private branches.
Commit
86ecdeefc81f6ee9e9afbf7a2e03650054f9a68531b654bb8ad442604804e9e2
Parent
dc8fcc7ff2fdf66…
1 file changed
+15
-2
+15
-2
| --- www/private.wiki | ||
| +++ www/private.wiki | ||
| @@ -31,14 +31,27 @@ | ||
| 31 | 31 | fossil update trunk |
| 32 | 32 | fossil merge private |
| 33 | 33 | fossil commit |
| 34 | 34 | </pre></blockquote> |
| 35 | 35 | |
| 36 | -The private branch remains private. (There is no way to convert a private | |
| 37 | -branch into a public branch.) But all of the changes associated with | |
| 36 | +The private branch remains private, but all of the changes associated with | |
| 38 | 37 | the private branch are now folded into the public branch and are hence |
| 39 | 38 | visible to other users of the project. |
| 39 | + | |
| 40 | +A private branch created with Fossil version 1.30 or newer can also be | |
| 41 | +converted into a public branch using the <code>fossil publish</code> | |
| 42 | +command. However, there is no way to convert a private branch created with | |
| 43 | +older versions of Fossil into a public branch. | |
| 44 | + | |
| 45 | +The <code>--integrate</code> option of <code>fossil merge</code> (to close | |
| 46 | +the merged branch when committing) is ignored for a private branch -- or the | |
| 47 | +check-in manifest of the resulting merge child would include a | |
| 48 | +<code>+close</code> tag referring to the leaf check-in on the private branch, | |
| 49 | +and generate a missing artifact reference on repository clones without that | |
| 50 | +private branch. It's still possible to close the leaf of the private branch | |
| 51 | +(after committing the merge child) with the <code>fossil amend --close</code> | |
| 52 | +command. | |
| 40 | 53 | |
| 41 | 54 | <h2>Syncing Private Branches</h2> |
| 42 | 55 | |
| 43 | 56 | A private branch normally stays on the one repository where it was |
| 44 | 57 | originally created. But sometimes you want to share private branches |
| 45 | 58 |
| --- www/private.wiki | |
| +++ www/private.wiki | |
| @@ -31,14 +31,27 @@ | |
| 31 | fossil update trunk |
| 32 | fossil merge private |
| 33 | fossil commit |
| 34 | </pre></blockquote> |
| 35 | |
| 36 | The private branch remains private. (There is no way to convert a private |
| 37 | branch into a public branch.) But all of the changes associated with |
| 38 | the private branch are now folded into the public branch and are hence |
| 39 | visible to other users of the project. |
| 40 | |
| 41 | <h2>Syncing Private Branches</h2> |
| 42 | |
| 43 | A private branch normally stays on the one repository where it was |
| 44 | originally created. But sometimes you want to share private branches |
| 45 |
| --- www/private.wiki | |
| +++ www/private.wiki | |
| @@ -31,14 +31,27 @@ | |
| 31 | fossil update trunk |
| 32 | fossil merge private |
| 33 | fossil commit |
| 34 | </pre></blockquote> |
| 35 | |
| 36 | The private branch remains private, but all of the changes associated with |
| 37 | the private branch are now folded into the public branch and are hence |
| 38 | visible to other users of the project. |
| 39 | |
| 40 | A private branch created with Fossil version 1.30 or newer can also be |
| 41 | converted into a public branch using the <code>fossil publish</code> |
| 42 | command. However, there is no way to convert a private branch created with |
| 43 | older versions of Fossil into a public branch. |
| 44 | |
| 45 | The <code>--integrate</code> option of <code>fossil merge</code> (to close |
| 46 | the merged branch when committing) is ignored for a private branch -- or the |
| 47 | check-in manifest of the resulting merge child would include a |
| 48 | <code>+close</code> tag referring to the leaf check-in on the private branch, |
| 49 | and generate a missing artifact reference on repository clones without that |
| 50 | private branch. It's still possible to close the leaf of the private branch |
| 51 | (after committing the merge child) with the <code>fossil amend --close</code> |
| 52 | command. |
| 53 | |
| 54 | <h2>Syncing Private Branches</h2> |
| 55 | |
| 56 | A private branch normally stays on the one repository where it was |
| 57 | originally created. But sometimes you want to share private branches |
| 58 |