Lluis, Ahh, I didn't know that about _FOSSIL_... I had assumed it was similar to a _darcs or .hg repo. I tried your suggestion (I didn't use the -keep flag) and it seemed to work fine from the perspective of not modifying my working directory and all timeline events were still there.
However, it didn't fix the problem. I still get the "database is locked" error on fossil sync. -KQ On Sat, 06 Aug 2011 10:24:18 -0700, Lluís Batlle i Rossell <virik...@gmail.com> wrote: > On Sat, Aug 06, 2011 at 10:09:33AM -0700, Kevin Quick wrote: >> If I do that I'll lose all changes in the local __FOSSIL__ that I >> haven't >> sync'd to the database. I think rebuilding the local __FOSSIL__ that >> way >> and losing all those changes is my fix of last resort, but I'm hoping >> for >> a more direct and less lossy repair. :-) >> >> -KQ > > The changes are not in _FOSSIL_. _FOSSIL_ only keeps the things you can > undo, > renames, your current checkout and little more. The already committed > changes > are in 'the database', and the modifications not committed, are in your > working > directory. > > Thus, maybe 'fossil open -keep' can help. But I never tried it. > >> On Sat, 06 Aug 2011 10:04:32 -0700, Lluís Batlle i Rossell >> <virik...@gmail.com> wrote: >> >> > On Sat, Aug 06, 2011 at 09:47:10AM -0700, Kevin Quick wrote: >> >> $ fossil sync PATH-TO-REPO >> >> Bytes Cards Artifacts Deltas >> >> Sent: 3897 82 0 0 >> >> Error: Database error: database is locked >> >> DELETE FROM unclustered WHERE rid IN (SELECT rid FROM private) >> >> Received: 118 1 0 0 >> >> Total network traffic: 2225 bytes sent, 813 bytes received >> >> $ >> > >> > I think you may need to 'close' (or remove _FOSSIL_) and 'open' again >> > your >> > repository, if you moved things. >> > _______________________________________________ >> > 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 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
