Fossil

Check-in [86ecdeef]
Login

Check-in [86ecdeef]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | private-branches
Files: files | file ages | folders
SHA3-256: 86ecdeefc81f6ee9e9afbf7a2e03650054f9a68531b654bb8ad442604804e9e2
User & Date: florian 2019-09-04 10:34:00
Context
2019-09-04
10:49
Update the 'reconstruct' command to issue an error instead of a warning on failure importing the list of private artifacts, so no new repository with all-public contents is created. ... (check-in: 8c4ef2c0 user: florian tags: private-branches)
10:34
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. ... (check-in: 86ecdeef user: florian tags: private-branches)
10:09
Reflow the help screens for 'deconstruct' and 'reconstruct', and add the new --keep-private option. ... (check-in: dc8fcc7f user: florian tags: private-branches)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/private.wiki.

︙︙
29
30
31
32
33
34
35
36
37
38
39














40
41
42
43
44
45
46


<blockquote><pre>
fossil update trunk
fossil merge private
fossil commit
</pre></blockquote>

The private branch remains private.  (There is no way to convert a private
branch into a public branch.)  But all of the changes associated with
the private branch are now folded into the public branch and are hence
visible to other users of the project.















<h2>Syncing Private Branches</h2>

A private branch normally stays on the one repository where it was
originally created.  But sometimes you want to share private branches
with another repository.  For example, you might be building a cross-platform
application and have separate repositories on your Windows laptop,








<
|


>
>
>
>
>
>
>
>
>
>
>
>
>
>








29
30
31
32
33
34
35

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59


<blockquote><pre>
fossil update trunk
fossil merge private
fossil commit
</pre></blockquote>


The private branch remains private, but all of the changes associated with
the private branch are now folded into the public branch and are hence
visible to other users of the project.

A private branch created with Fossil version 1.30 or newer can also be
converted into a public branch using the <code>fossil publish</code>
command.  However, there is no way to convert a private branch created with
older versions of Fossil into a public branch.

The <code>--integrate</code> option of <code>fossil merge</code> (to close
the merged branch when committing) is ignored for a private branch -- or the
check-in manifest of the resulting merge child would include a
<code>+close</code> tag referring to the leaf check-in on the private branch,
and generate a missing artifact reference on repository clones without that
private branch.  It's still possible to close the leaf of the private branch
(after committing the merge child) with the <code>fossil amend --close</code>
command.

<h2>Syncing Private Branches</h2>

A private branch normally stays on the one repository where it was
originally created.  But sometimes you want to share private branches
with another repository.  For example, you might be building a cross-platform
application and have separate repositories on your Windows laptop,
︙︙