Fossil

Diff
Login

Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [9c9e5c15a9]:

To Artifact [5a9dc97683]:

︙
38
39
40
41
42
43
44
45
46
47
48
49
50








51
52
53
54
55
56
57
58
59

38
39
40
41
42
43
44






45
46
47
48
49
50
51
52


53
54
55
56
57
58
59








-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-








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
If the <code>--integrate</code> option of <code>fossil merge</code> (to close
the merged branch when committing) is used for a private branch, a separate
control artifact to apply the <code>+close</code> tag is created and added to
the repository during the commit process.  Managing the <code>+close</code>
tag directly from the check-in manifest of the resulting merge child would
generate a reference to the leaf check-in on the private branch, and generate
a missing artifact reference (a "phantom") on repository clones without that
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,
︙