Fossil SCM
Update the documentation to mention the separate control artifacts created to close private branches that were merged with the `--integrate' option.
Commit
e1e618d17f5a7712b72b8fe32584cd29f56de56be3a79c9cd705ecbf037b3b28
Parent
767b175d906b9ae…
1 file changed
+8
-8
+8
-8
| --- www/private.wiki | ||
| +++ www/private.wiki | ||
| @@ -40,18 +40,18 @@ | ||
| 40 | 40 | A private branch created with Fossil version 1.30 or newer can also be |
| 41 | 41 | converted into a public branch using the <code>fossil publish</code> |
| 42 | 42 | command. However, there is no way to convert a private branch created with |
| 43 | 43 | older versions of Fossil into a public branch. |
| 44 | 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. | |
| 45 | +If the <code>--integrate</code> option of <code>fossil merge</code> (to close | |
| 46 | +the merged branch when committing) is used for a private branch, a separate | |
| 47 | +control artifact to apply the <code>+close</code> tag is created and added to | |
| 48 | +the repository during the commit process. Managing the <code>+close</code> | |
| 49 | +tag directly from the check-in manifest of the resulting merge child would | |
| 50 | +generate a reference to the leaf check-in on the private branch, and generate | |
| 51 | +a missing artifact reference (a "phantom") on repository clones without that | |
| 52 | +private branch. | |
| 53 | 53 | |
| 54 | 54 | <h2>Syncing Private Branches</h2> |
| 55 | 55 | |
| 56 | 56 | A private branch normally stays on the one repository where it was |
| 57 | 57 | originally created. But sometimes you want to share private branches |
| 58 | 58 |
| --- www/private.wiki | |
| +++ www/private.wiki | |
| @@ -40,18 +40,18 @@ | |
| 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 |
| --- www/private.wiki | |
| +++ www/private.wiki | |
| @@ -40,18 +40,18 @@ | |
| 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 | If the <code>--integrate</code> option of <code>fossil merge</code> (to close |
| 46 | the merged branch when committing) is used for a private branch, a separate |
| 47 | control artifact to apply the <code>+close</code> tag is created and added to |
| 48 | the repository during the commit process. Managing the <code>+close</code> |
| 49 | tag directly from the check-in manifest of the resulting merge child would |
| 50 | generate a reference to the leaf check-in on the private branch, and generate |
| 51 | a missing artifact reference (a "phantom") on repository clones without that |
| 52 | private branch. |
| 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 |