[fossil-users] [OT] command line help and question marks for oprtional arguments

Hello, one thing that puzzles me every time I do fossil help is the presence of question marks for oprtional parameters, as in % fossil help commit Usage: fossil commit ?OPTIONS? ?FILE...? while I would expect it to be like % fossil help commit Usage: fossil commit [OPTIONS] [FILE...] Now, if

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

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 mobile

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

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 wrote: > Thus said "Ardie H. Hwang" on Thu, 04 Jun 2015 06:01:15 +0900: > > > Clearly, server does not know the

[fossil-users] Renames and multiple merges

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 hel

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

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 _

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

On Wed, Jun 3, 2015 at 5:01 PM, Ardie H. Hwang 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 forward fix wo

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

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

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

On Wed, Jun 3, 2015 at 10:24 AM, Jan Nijtmans wrote: > 2015-04-25 1:29 GMT+02:00 Ron W : > > 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 suggestion has been heard, and it's fi

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

On Wed, Jun 3, 2015 at 10:24 AM, Jan Nijtmans wrote: > 2015-04-25 1:29 GMT+02:00 Ron W : > > 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 suggestion has been heard, and it's fi

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

2015-04-25 1:29 GMT+02:00 Ron W : > A new coworker opted to use Cygwin on her PC rather than have a second PC > with Linux. The external gdiff command she configured is winmerge.exe - a > Windows application. > > In the Cygwin command window, she did a "fossil gdiff". Winmerge complained > about >