Re: [fossil-users] Newly introduced inconsistency

2013-01-18 Thread j. van den hoff
On Fri, 18 Jan 2013 10:46:20 +0100, Stephan Beal sgb...@googlemail.com wrote: On Thu, Jan 17, 2013 at 1:45 PM, Stephan Beal sgb...@googlemail.com wrote: the difference between the two numbers differs in different repositories, but info/stat consistently show _lower_ values. They use a

Re: [fossil-users] Newly introduced inconsistency

2013-01-18 Thread Stephan Beal
(this time to the list) On Fri, Jan 18, 2013 at 11:03 AM, j. van den hoff veedeeh...@googlemail.com wrote: thanks for the info. questions: this does not effect the off by one between timeline and dbstat in the fossil repo itself, right? Correct - i haven't yet looked at that. I believe

Re: [fossil-users] Newly introduced inconsistency

2013-01-18 Thread Stephan Beal
On Thu, Jan 17, 2013 at 1:45 PM, Stephan Beal sgb...@googlemail.com wrote: On Thu, Jan 17, 2013 at 12:24 PM, j. van den hoff veedeeh...@googlemail.com wrote: regarding formatting of the output: I probably would label the corresponding `dbstat' entries like this: ... checkins:

Re: [fossil-users] some questions about fossil-as-document-repo

2013-01-18 Thread Eugen Leitl
On Fri, Jan 18, 2013 at 09:33:05AM +0800, David Baxendale (GMail - Singapore) wrote: I don't think Fossil is the right tool for this, take a look at Calibre (http://calibre-ebook.com/) as an Open Source document management system, not just an e-book reader. Calibre can't handle several

[fossil-users] A warning on 'undo'

2013-01-18 Thread Lluís Batlle i Rossell
Hello, fossil overwrote some changes I had, without telling, on 'undo' command; I'd prefer it to give a warning. I used: $ fossil merge otherbranch $ test... edit a file... test... and I decide I don't want the merge $ fossil undo # This restores all files merged, ignoring my file edit. I'd

Re: [fossil-users] A warning on 'undo'

2013-01-18 Thread sky5walk
When in doubt, I run: fossil status On Fri, Jan 18, 2013 at 11:37 AM, Lluís Batlle i Rossell vi...@viric.name wrote: Hello, fossil overwrote some changes I had, without telling, on 'undo' command; I'd prefer it to give a warning. I used: $ fossil merge otherbranch $ test... edit a file...

[fossil-users] Strange fossil use (multiple leaves)

2013-01-18 Thread Lluís Batlle i Rossell
Hello, looking at the tcl timeline, I've just seen a checkin like this: http://core.tcl.tk/tcl/timeline?f=3c4edc83aae0e671 What is that kind of usage? I feel strange that the merge trunk has arrows from *3 trunk leaves*, and *2 more checkins* from one of the trunk branches. What have they typed

Re: [fossil-users] A warning on 'undo'

2013-01-18 Thread Lluís Batlle i Rossell
On Fri, Jan 18, 2013 at 11:46:50AM -0500, sky5w...@gmail.com wrote: When in doubt, I run: fossil status Well, I usually don't doubt. If fossil doesn't warn me, I consider it hasn't thrown away any my local changes. And I don't want to doubt. :) Regards, Lluís. On Fri, Jan 18, 2013 at 11:37

[fossil-users] newbie branch question

2013-01-18 Thread John Griessen
Hi, I imported a project history from git and it seems I skipped a step since when I do fossil branch ls it shows I am not on a branch. A new checkout in a different dir by doing fossil open ../tek_7k_flex.fossil shows I am on trunk when I do fossil branch ls in that dir. I tried using

Re: [fossil-users] newbie branch question

2013-01-18 Thread Richard Hipp
On Fri, Jan 18, 2013 at 12:01 PM, John Griessen j...@industromatic.comwrote: Hi, I imported a project history from git and it seems I skipped a step since when I do fossil branch ls it shows I am not on a branch. A new checkout in a different dir by doing fossil open

Re: [fossil-users] newbie branch question

2013-01-18 Thread John Griessen
On 01/18/2013 11:01 AM, John Griessen wrote: Hi, I imported a project history from git and it seems I skipped a step since when I do fossil branch ls it shows I am not on a branch. Now I'm getting somewhere using this from the checkout of trunk: fossil checkout

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread sky5walk
Well, it looks like a Win32 binary for v1.25 is DIY. :( Really want to try the new fossil diff features... I am slightly C literate but don't use that environment day to day. I downloaded latest fossil src and zlib and MinGW and Pelles C and no luck trying their make files. Is there an explicit

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Richard Hipp
On Fri, Jan 18, 2013 at 1:32 PM, sky5w...@gmail.com wrote: Well, it looks like a Win32 binary for v1.25 is DIY. :( Really want to try the new fossil diff features... I am slightly C literate but don't use that environment day to day. I downloaded latest fossil src and zlib and MinGW and

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread sky5walk
Whoa! I am psyched if it's really that easy! 1. Visual Studio is not in my PATH, but the following cmd seems to have tried and failed? - c:\_Soft\fossil\src\winC:\Program Files\Microsoft Visual Studio 10.0\VC\bin\nmake /f Makefile.msc - Microsoft

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Richard Hipp
On Fri, Jan 18, 2013 at 2:09 PM, sky5w...@gmail.com wrote: Whoa! I am psyched if it's really that easy! 2. Trying MinGW got the furthest... - c:\_Soft\fossil\srcC:\MinGW\msys\1.0\bin\make -f win/Makefile.mingw -- ~...make headers...

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Jan Danielsson
On 01/18/13 20:09, sky5w...@gmail.com wrote: 1. Visual Studio is not in my PATH, but the following cmd seems to have tried and failed? Don't start a normal cmd.exe; start the Start Visual Studio Command Line (don't remember the exact title, but you'll find it easily if you look for it),

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread sky5walk
Done! :) Had to download VS10 Express. Then as Jan said, run: Visual Studio Command Prompt (2010) Then run per fossil doc's and Dr Hipp C:\_Soft\fossil\src\winnmake /f Makefile.msc No changes required. Thanks for fossil. On Fri, Jan 18, 2013 at 2:27 PM, Jan Danielsson jan.m.daniels...@gmail.com

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Konstantin Khomoutov
On Fri, Jan 18, 2013 at 08:27:17PM +0100, Jan Danielsson wrote: 1. Visual Studio is not in my PATH, but the following cmd seems to have tried and failed? Don't start a normal cmd.exe; start the Start Visual Studio Command Line (don't remember the exact title, but you'll find it easily

Re: [fossil-users] sqlite errors after reinstalling fossil

2013-01-18 Thread Joseph Mingrone
Richard, Martin, Matt and Baptiste; On Thu, Jan 17, 2013 at 5:58 PM, Martin S. Weber martin.we...@nist.gov wrote: Wild guess: are you running your rpc services, lockd and statd amongst them? (server? client?) On Thu, Jan 17, 2013 at 7:23 PM, Baptiste Daroussin baptiste.darous...@gmail.com

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Konstantin Khomoutov
On Sat, Jan 19, 2013 at 12:47:59AM +0400, Konstantin Khomoutov wrote: 1. Visual Studio is not in my PATH, but the following cmd seems to have tried and failed? Don't start a normal cmd.exe; start the Start Visual Studio Command Line (don't remember the exact title, but you'll find

Re: [fossil-users] [CFT] Limiting time spend on a single single xfer for clients

2013-01-18 Thread Joerg Sonnenberger
On Wed, Jan 16, 2013 at 12:46:51AM +0100, Joerg Sonnenberger wrote: the attached patch against 1.23 limits the time a single client can consume for one pull request on the server. I've pushed a version of this to the experimental patch. Testing especially on Windows is appreciated. Joerg

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Ross Berteig
On 1/18/2013 10:51 AM, Richard Hipp wrote: On Fri, Jan 18, 2013 at 1:32 PM, sky5w...@gmail.com mailto:sky5w...@gmail.com wrote: Well, it looks like a Win32 binary for v1.25 is DIY. :( Really want to try the new fossil diff features... You need: (1) Fossil sources (2) Either

Re: [fossil-users] Fossil 1.25

2013-01-18 Thread Martin Gagnon
Le 2013-01-18 à 14:09, sky5w...@gmail.com a écrit : [Snip] 2. Trying MinGW got the furthest... - c:\_Soft\fossil\srcC:\MinGW\msys\1.0\bin\make -f win/Makefile.mingw -- ~...make headers... wbld/VERSION.h Input file