Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-13 Thread Jan Nijtmans
2014/1/12 Matt Welland estifo...@gmail.com: I've tested both these ideas and they appear to work. It does look like shunning or removing the initial commit is needed or somehow the code sees a connection between the trees. In my test half the files had no ancestor and did not merge and half

[fossil-users] SQLITE_ENABLE_EXPLAIN_COMMENTS recommended option? [Was: Version 1.28 release?]

2014-01-13 Thread Jan Nijtmans
Fossil's internal SQLite is currently compiled with the following options (main.mk): SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \ -DSQLITE_ENABLE_LOCKING_STYLE=0 \ -DSQLITE_THREADSAFE=0 \ -DSQLITE_DEFAULT_FILE_FORMAT=4 \

Re: [fossil-users] SQLITE_ENABLE_EXPLAIN_COMMENTS recommended option? [Was: Version 1.28 release?]

2014-01-13 Thread Richard Hipp
Adding SQLITE_ENABLE_EXPLAIN_COMMENTS makes the output of EXPLAIN in the shell much, much easier to read. Leave it turned on. On Mon, Jan 13, 2014 at 7:55 AM, Jan Nijtmans jan.nijtm...@gmail.comwrote: Fossil's internal SQLite is currently compiled with the following options (main.mk):

Re: [fossil-users] SQLITE_ENABLE_EXPLAIN_COMMENTS recommended option? [Was: Version 1.28 release?]

2014-01-13 Thread Jan Nijtmans
2014/1/13 Richard Hipp d...@sqlite.org: Adding SQLITE_ENABLE_EXPLAIN_COMMENTS makes the output of EXPLAIN in the shell much, much easier to read. Leave it turned on. In that case, I think that build.wiki (and the comment in SQLite) should be adapted accordingly. I have no opinion whether it

Re: [fossil-users] SQLITE_ENABLE_EXPLAIN_COMMENTS recommended option? [Was: Version 1.28 release?]

2014-01-13 Thread Jan Nijtmans
2014/1/13 Jan Nijtmans jan.nijtm...@gmail.com: In that case, I think that build.wiki (and the comment in SQLite) should be adapted accordingly. I have no opinion whether it should be on or off, that's not my main point. Of course, I meant makefile.wiki Regards, Jan Nijtmans

Re: [fossil-users] SQLITE_ENABLE_EXPLAIN_COMMENTS recommended option? [Was: Version 1.28 release?]

2014-01-13 Thread Jan Nijtmans
2014/1/13 Jan Nijtmans jan.nijtm...@gmail.com: Of course, I meant makefile.wiki http://fossil-scm.org/index.html/info/cde4759d5e Thanks! That was exactly my question. Regards, Jan Nijtmans ___ fossil-users mailing list

Re: [fossil-users] TH1: set v 0; unset v; info exists v;

2014-01-13 Thread Sergei Gavrikov
Sergei Gavrikov wrote: As I could see Th_ExistsVar() does miss a test for pValue-zData as Th_GetVar() does http://fossil-scm.org/index.html/artifact/a561c58c237b3eb43eaf55e6f9cc6a9b8a26e5d1?ln=1142-1149. It looks like the same check is needed for Th_UnsetVar() too. # Expect

Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-13 Thread Stephan Beal
On Mon, Jan 13, 2014 at 10:56 AM, Jan Nijtmans jan.nijtm...@gmail.comwrote: sqlite3 .fossil sqlite3 UPDATE vvar SET value=0 WHERE name='checkout'; sqlite3 DELETE from vmerge; sqlite3 DELETE from vfile; sqlite3 .exit fossil commit --branch branch

[fossil-users] how to deal with files which became directories?

2014-01-13 Thread Christian Pekeler
I have a Numbers document in Fossil. It used to be just a file, now it's a folder. How can I commit this change to Fossil? fossil stat ... NOT_A_FILE Documents/daycare_stats.numbers ls -l Documents/daycare_stats.numbers total 504 drwxr-xr-x 2 pekeler staff 68 12 Jan 11:31 Data

[fossil-users] Tree view and browser back button

2014-01-13 Thread Martin Gagnon
Hello, I like very much the new tree view but there's one thing that I found a bit annoying. After clicking on a file that is deep in the directory structure, the tree become all collapsed again after pressing the back button. I think it would be useful that tree state come back to how it was

Re: [fossil-users] Tree view and browser back button

2014-01-13 Thread Richard Hipp
On Mon, Jan 13, 2014 at 3:51 PM, Martin Gagnon eme...@gmail.com wrote: I like very much the new tree view but there's one thing that I found a bit annoying. After clicking on a file that is deep in the directory structure, the tree become all collapsed again after pressing the back button.

Re: [fossil-users] Tree view and browser back button

2014-01-13 Thread James Turner
On Mon, Jan 13, 2014 at 03:54:34PM -0500, Richard Hipp wrote: On Mon, Jan 13, 2014 at 3:51 PM, Martin Gagnon eme...@gmail.com wrote: I like very much the new tree view but there's one thing that I found a bit annoying. After clicking on a file that is deep in the directory structure,

Re: [fossil-users] Tree view and browser back button

2014-01-13 Thread James Turner
On Mon, Jan 13, 2014 at 04:03:14PM -0500, James Turner wrote: On Mon, Jan 13, 2014 at 03:54:34PM -0500, Richard Hipp wrote: On Mon, Jan 13, 2014 at 3:51 PM, Martin Gagnon eme...@gmail.com wrote: I like very much the new tree view but there's one thing that I found a bit annoying.

Re: [fossil-users] Tree view and browser back button

2014-01-13 Thread Martin Gagnon
On Mon, Jan 13, 2014 at 03:54:34PM -0500, Richard Hipp wrote: On Mon, Jan 13, 2014 at 3:51 PM, Martin Gagnon eme...@gmail.com wrote: I like very much the new tree view but there's one thing that I found a bit annoying. After clicking on a file that is deep in the directory

Re: [fossil-users] Version 1.28 release?

2014-01-13 Thread Mark Janssen
On Thu, Jan 9, 2014 at 2:20 PM, Richard Hipp d...@sqlite.org wrote: It has been a few months since the last official release of Fossil. I wonder if we should consider publishing trunk as the official version 1.28? -- D. Richard Hipp d...@sqlite.org

Re: [fossil-users] how to deal with files which became directories?

2014-01-13 Thread Christian Pekeler
On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I have a Numbers document in Fossil. It used to be just a file, now it's a folder. How can I commit this change to Fossil? fossil rm

Re: [fossil-users] how to deal with files which became directories?

2014-01-13 Thread Martin Gagnon
On Mon, Jan 13, 2014 at 10:51:18PM -0700, Christian Pekeler wrote: On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I have a Numbers document in Fossil. It used to be just a file, now it's

Re: [fossil-users] TH1: set v 0; unset v; info exists v;

2014-01-13 Thread Sergei Gavrikov
On Mon, 13 Jan 2014, Joe Mistachkin wrote: Sergei Gavrikov wrote: It looks like the same check is needed for Th_UnsetVar() too. Actually, the issue with Th_UnsetVar was slightly different; however, it should be fixed now: http://www.fossil-scm.org/index.html/info/1ebe4b02e4

Re: [fossil-users] how to deal with files which became directories?

2014-01-13 Thread Martin Gagnon
On Tue, Jan 14, 2014 at 01:02:36AM -0500, Martin Gagnon wrote: On Mon, Jan 13, 2014 at 10:51:18PM -0700, Christian Pekeler wrote: On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I