Re: [fossil-users] private branches

[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

[fossil-users] private branches

[Scott Doctor]

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.


I am confuzzled. Seems the private branch becomes public by 
folding into the public branch.


I am inheriting some 20 year old C code for a device that is 
being completely redesigned with modern everything. The 
algorithms used in the old code required going through many 
months of verification and certification  (government mandated). 
I need to track all changes (I am going to be gut it using a 
facsimile of the core algorithm) so I figure this is a good 
candidate for using Fossil. They are currently using an ancient 
CVS system that, well I could not find a single reference to it 
anywhere. So I am going to try to convince them to use a 
different system since we are effectively starting from scratch. 
So I am back again trying to figure out the details how to use 
fossil before I am forced to use some other system. Fossil seems 
to be the least painful of the alternatives.


--

-
Scott Doctor
sc...@scottdoctor.com
-

___
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] Error synchronizing private check-ins

[Ralf Hoermann]

Am 20.11.2016 um 21:36 schrieb Mikhail Kryshen:

Hello,

I reported this error some time ago against Fossil 1.32:
https://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20064.html

It is still reproducible in Fossil 1.36:

$ fossil new 1.fossil
$ fossil open 1.fossil
$ touch file
$ fossil add file
$ fossil commit -m "private" --private
$ fossil clone 1.fossil 2.fossil

$ fossil pull -R 2.fossil 1.fossil --private
Round-trips: 1   Artifacts sent: 0  received: 0
SQLITE_CONSTRAINT: abort at 8 in [INSERT INTO private VALUES(2)]: UNIQUE 
constraint failed: private.rid
fossil: UNIQUE constraint failed: private.rid: {INSERT INTO private VALUES(2)}


I had the same issue recently. I was able to pull the private check-in 
successfully after deleting all records from the private table. Hope I 
didn't mess anything up by doing that.

$ fossil push -R 1.fossil 2.fossil --private
Round-trips: 2   Artifacts sent: 2  received: 0
Error: Database error: UNIQUE constraint failed: private.rid: {INSERT INTO 
private VALUES(2)}
Round-trips: 2   Artifacts sent: 2  received: 0
Push done, sent: 894  received: 670  ip:

$ fossil version
This is fossil version 1.36 [c24373934d] 2016-10-24 14:59:33 UTC



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


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

[fossil-users] UNIQUE constraint fail on sync -private

[Andy Goth]

Not a lot of time to write.  I'm on my way to the airport but need to
prepare by sync'ing some Fossil repositories onto a laptop.  I did a
"fossil sync -once -private http://...; to push private branches to
another laptop, only to be hit with:

Error: Database error: UNIQUE constraint failed: private.rid: {INSERT
INTO private VALUES(148260)}

When I checked the private table of the recipient, indeed that RID was
already marked private, along with all the others from the private
branches I'm pushing.

Looks like something is getting done twice, perhaps...?

Yet the new artifacts do not show in /rcvfromlist nor /timeline.

My quick fix was to change "INSERT INTO private" to "INSERT OR IGNORE
INTO private" in content_put_ex() in content.c.  Making the same change
in content_new() didn't help, though maybe it would have avoided the
original problem.  I don't have time to check.

-- 
Andy Goth | 



signature.asc
Description: OpenPGP digital signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users