I'll give it a go and see if that changes things. I wound up having to do a looot of surgery to the fossil repo after doing a round-trip sync, but then I had to do some workarounds of the 'invalid sha-1...', to get to that point, and maybe those were a side-effect (basically, the whole checkin tree in fossil was duplicated after doing a round-trip incremental import -- there were the original ones from fossil, then when importing from git, there were 'duplicates'. Purging the original fossil ones and keeping the 'git originated duplicates' then allowed subsequent syncs to work OK).
-----Original Message----- From: fossil-users [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of gumblex Sent: Sunday, April 29, 2018 1:07 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] issues with two way synchronization Fossil <-> Git... Hi, 'Invalid SHA-1 in marks file' should be fixed in the last release. 2018-04-30 1:52, dave <d...@ziggurat29.com>: Folks, I have been trying to set up a two way synchronization between Fossil and Git for a while now and have had lots of troubles; all sorts of things like: 'Invalid SHA-1 in marks file', 'SQLITE_ERROR: no such table: vvar' 'SQLITE_MISUSE: API called with NULL prepared statement' 'SQLITE_MISUSE: misuse at line 77593 of [1a584e4999]' etc. After much yanking and twisting, I have made it /seem/ to work, but surely it shouldn't require everything I did. Hence my next two questions: 1) is fossil <-> git synchronization something that is 'experimental', and I should not touch it, or is it expected to work? 2) I am happy to write up in full detail all my reproduction steps and (half-baked) workarounds, but this will be a very long email, and will take me probably about 3-4 hours to prepare. Hence, I am wondering if the answer to question '1' implies 'don't bother investing the time', or does it imply 'please do send us the lurid details so we can cogitate upon them'. Oh, in advance of that, at least this doesn't require much effort: * C:\Experiments\fossils>fossil version This is fossil version 2.4 [a0001dcf57] 2017-11-03 09:29:29 UTC * C:\Experiments\fossils>git --version git version 2.14.1.windows.1 * My Git hosting is on Bitbucket. I don't /think/ that matters, but you never know. Cheers! -dave
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
