[fossil-users] Irrecoverable repository inconsistency between local and remote, after an assertion failure on Windows.

2015-06-03 Thread Ardie H. Hwang
Hello all, I usually use fossil on my OS X and FreeBSD machines, rarely on Windows. But today, I somehow triggered assertion failure on Windows upon auto-syncing local repository with remote repo on my server. After the assertion-failure-caused runtime error, fossil just do not sync with the

Re: [fossil-users] Irrecoverable repository inconsistency between local and remote, after an assertion failure on Windows.

2015-06-03 Thread Ron W
On Wed, Jun 3, 2015 at 5:01 PM, Ardie H. Hwang li...@ardiefox.me wrote: Clearly, server does not know the existence of check-in `da19b8f2e5d89310d80b90a6a27d2d70ff646ad1`. Is there any advice on resolving this issue? Have you looked at the time line on the server? I think the most straight

Re: [fossil-users] relative vs full path for external diff command

2015-06-03 Thread Ron W
On Wed, Jun 3, 2015 at 10:24 AM, Jan Nijtmans jan.nijtm...@gmail.com wrote: 2015-04-25 1:29 GMT+02:00 Ron W ronw.m...@gmail.com: Would it be reasonable for Fossil to have a setting, or option in the diff/gdiff command setting, to indicate that relative paths should be supplied? You

Re: [fossil-users] relative vs full path for external diff command

2015-06-03 Thread Ron W
On Wed, Jun 3, 2015 at 10:24 AM, Jan Nijtmans jan.nijtm...@gmail.com wrote: 2015-04-25 1:29 GMT+02:00 Ron W ronw.m...@gmail.com: Would it be reasonable for Fossil to have a setting, or option in the diff/gdiff command setting, to indicate that relative paths should be supplied? You

Re: [fossil-users] Irrecoverable repository inconsistency between local and remote, after an assertion failure on Windows.

2015-06-03 Thread Andy Bradford
Thus said Ardie H. Hwang on Thu, 04 Jun 2015 06:01:15 +0900: Clearly, server does not know the existence of check-in `da19b8f2e5d89310d80b90a6a27d2d70ff646ad1`. Is there any advice on resolving this issue? Have you tried: fossil push Thanks, Andy -- TAI64 timestamp: 4000556fa631

[fossil-users] Renames and multiple merges

2015-06-03 Thread Andy Goth
After renaming files on a branch, it seems Fossil will allow you only one successful merge until it loses track of which files are which. Here's a sequence showing the problem (version 3ffb6a3e62): f new merge-rename.fossil mkdir merge-rename cd merge-rename f open ../merge-rename.fossil echo

Re: [fossil-users] Irrecoverable repository inconsistency between local and remote, after an assertion failure on Windows.

2015-06-03 Thread Ardie H. Hwang
I did not issue `fossil push` because I wasn't sure whether the local repo is in stable state or not, although the error occurred at sync phase. I will try what Ron and Matt suggested then report back. Thanks for all the replies. -- Ardie H. Hwang email: i...@ardiefox.me

Re: [fossil-users] Irrecoverable repository inconsistency between local and remote, after an assertion failure on Windows.

2015-06-03 Thread Matt Welland
Another thing to try if you haven't already done so is to rebuild repos at both ends. I've seen this fix weird sync errors a couple times. On Wed, Jun 3, 2015 at 6:12 PM, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Ardie H. Hwang on Thu, 04 Jun 2015 06:01:15 +0900: Clearly,