Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Eric Rubin-Smith
Stephan Beal wrote: FYI: i committed one on top of that. The advantage is that it's centralized, the disadvantage is that it hashes every manifest before parsing (to get the UUID, since parsing modifies it). Might be considered too expensive, considering how rare broken manifests are.

Re: [fossil-users] Anyway to diagnose a malformed disk image ?

2014-10-23 Thread Richard Hipp
On Thu, Oct 23, 2014 at 10:20 AM, B Harder brad.har...@gmail.com wrote: kamloops$ fossil open ../fossils/netbsd_src.fsl SQLITE_CORRUPT: database corruption at line 53640 of [e4ab094f8a] SQLITE_CORRUPT: database corruption at line 53679 of [e4ab094f8a] SQLITE_CORRUPT: statement aborts at 3:

Re: [fossil-users] Anyway to diagnose a malformed disk image ?

2014-10-23 Thread B Harder
Done: *** in database main *** Page 36044: btreeInitPage() returns error code 11 Page 36045: btreeInitPage() returns error code 11 Page 36046: btreeInitPage() returns error code 11 Page 36047: btreeInitPage() returns error code 11 Page 36048: btreeInitPage() returns error code 11 Page 36049:

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Eric Rubin-Smith
Stephan Beal wrote: We'd be interested in hearing back if you discover how an error on your end (if indeed it is) is confusing fossil into trying to read non-manifest files as manifests. Actually, your question sort of confuses me. From my (very tenuous) understanding of the code, it

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Stephan Beal
On Thu, Oct 23, 2014 at 5:06 PM, Eric Rubin-Smith eas@gmail.com wrote: Stephan Beal wrote: We'd be interested in hearing back if you discover how an error on your end (if indeed it is) is confusing fossil into trying to read non-manifest files as manifests. Actually, your question

[fossil-users] branch ID as well as branch name

2014-10-23 Thread Ron W
In a discussion between a Git user and a user of both Mercurial and Git, there was a debate of the relative merits of named branches vs bookmark branches. Mercurial (and Fossil) supports named branches (Mercurial recently added support for bookmark branches). Git supports bookmark branches. With

Re: [fossil-users] branch ID as well as branch name

2014-10-23 Thread Richard Hipp
On Thu, Oct 23, 2014 at 12:56 PM, Ron W ronw.m...@gmail.com wrote: In a discussion between a Git user and a user of both Mercurial and Git, there was a debate of the relative merits of named branches vs bookmark branches. Mercurial (and Fossil) supports named branches (Mercurial recently

Re: [fossil-users] SVN -- Fossil Chiselapp hosting

2014-10-23 Thread Baruch Burstein
On Thu, Oct 23, 2014 at 7:26 PM, Ron W ronw.m...@gmail.com wrote: Also, another reason in favor of a direct importer: Git only tracks the heads of branches. No history is being lost, just that determining what branch a given commit belongs to is difficult. Therefor, git-fast-import doesn't

Re: [fossil-users] SVN -- Fossil Chiselapp hosting

2014-10-23 Thread David Mason
On 23 October 2014 12:26, Ron W ronw.m...@gmail.com wrote: Having read post from many places, one of the big complaints SVN users have about Git is directory tracking. Fossil lack this, too. I had a weird related issue the other day (I would argue it's a bug, but YMMV). I was moving an

Re: [fossil-users] diff --tk features and to-dos. Was: Diff against working copy

2014-10-23 Thread tonyp
Please save me the trouble of search - Do I have a Contributors Agreement for you in the firesafe? May I suggest this great SQLite3 tool to help you (1) keep track of your documents, and (2) quickly search for membership without even going to the safe? (Sorry, I couldn’t resist!

Re: [fossil-users] diff --tk features and to-dos. Was: Diff against working copy

2014-10-23 Thread Andreas Kupries
Fossil currently does not have FTS on content, be it code, wiki pages, or tickets. Unfortunately :( On Thu, Oct 23, 2014 at 11:06 AM, to...@acm.org wrote: Please save me the trouble of search - Do I have a Contributors Agreement for you in the firesafe? May I suggest this great

Re: [fossil-users] fossil timeline behaviour change from 1.24 to 1.29 to 1.30

2014-10-23 Thread Stefan Bellon
On Sun, 19 Oct, Stefan Bellon wrote: If not introducing a new flag but re-using the verbose flag, then the patch would be almost trivial and look like this: --- src/timeline.c +++ src/timeline.c @@ -1602,11 +1602,15 @@ } if( fossil_strcmp(zCurrentUuid,zId)==0 ){

Re: [fossil-users] fossil timeline behaviour change from 1.24 to 1.29 to 1.30

2014-10-23 Thread Jan Nijtmans
2014-10-23 21:55 GMT+02:00 Stefan Bellon sbel...@sbellon.de: On Sun, 19 Oct, Stefan Bellon wrote: -zFree = mprintf([%S] %s%s, zId, zPrefix, zCom); +if (verboseFlag){ + zFree = mprintf([%s] %s%s, zId, zPrefix, zCom); +}else{ + zFree = mprintf([%S] %s%s, zId,

Re: [fossil-users] fossil timeline behaviour change from 1.24 to 1.29 to 1.30

2014-10-23 Thread Stefan Bellon
On Thu, 23 Oct, Andy Bradford wrote: I could be wrong, but is it possible that what he's asking for is a consistency in a fixed output width when %S is being used in the timeline? Or an option to have fixed width UUIDs in the timeline? Consider the timeline output here

Re: [fossil-users] fossil timeline behaviour change from 1.24 to 1.29 to 1.30

2014-10-23 Thread Andy Bradford
Thus said Stefan Bellon on Thu, 23 Oct 2014 23:49:47 +0200: What I propose is a consistent and reliable output which doesn't change when using the same switches specified. I can live with the current state, however it does not feel right for automated usage. And that would be the