Re: [fossil-users] private branches

2016-11-22 Thread Martin Gagnon
Hi Scott,

On Mon, Nov 21, 2016 at 08:47:22PM -0800, Scott Doctor wrote:
> Reading through the fossil documentation about private branches. It
> states that There is no way to convert a private branch into a
> public branch. But all of the changes associated with the private
> branch are folded into the public branch and are hence visible to
> other users of the project.

Private branch use to be very limited in functionality. If I remember
well, it was possible to convert all the private branches at once, but
not a single branch.

But since the addition of the "bundle" functionality, it's now possible
to convert a private branch into a public branch easily using the
"publish" command.

see http://fossil-scm.org/index.html/help?cmd=publish

   [snip]


Regards

-- 
Martin G.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] private branches

2016-11-22 Thread Andy Bradford
Thus said Scott Doctor on Mon, 21 Nov 2016 20:47:22 -0800:

> But all of  the changes associated with the private  branch are folded
> into the  public branch and  are hence visible  to other users  of the
> project.

Precisely, only the  changes are visible (e.g. the diff  between the two
merge parents),  but the branch, and  all the changes leading  up to the
merge will still be private. So if you add a line, then remove the line,
when  you merge  there will  be  no public  record of  having added  and
removed a line.

Andy
-- 
TAI64 timestamp: 40005834836a


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] private branches

2016-11-21 Thread Luca Ferrari
On Tue, Nov 22, 2016 at 5:47 AM, Scott Doctor  wrote:
> I am confuzzled. Seems the private branch becomes public by folding into the
> public branch.

Not really: the private branch (commits) has to be merged into a
public branch, therefore each commit of the private branch gets its
way into a public branch. After this the "private" branch will remain
private in the sense it will not participate into any push/pull
operation, so you are free to continue working on the private branch
and nobody will see such work until you merge somewhere in the public.

Beside this, I never used private branches so far, therefore I could be wrong.

Luca
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users