Re: [fossil-users] commit command seems to be slow

2011-08-05 Thread Lluís Batlle i Rossell
mind any of the names, but I'd like ot be one pair and enforced. That's my vote. :) > > - Original Message - > > From: Wes Freeman > > Sent: 08/04/11 09:32 PM > > To: fossil-users@lists.fossil-scm.org > > Subject: Re: [fossil-users] commit command seems t

Re: [fossil-users] commit command seems to be slow

2011-08-04 Thread Lluís Batlle i Rossell
On Thu, Aug 04, 2011 at 05:21:00PM +0200, Stephan Beal wrote: > 2011/8/4 Lluís Batlle i Rossell > > > (btw, I never know what do I have to write to enable. 'on', '1', 'yes', ... > > and > > what to disable) > > > > Try 

Re: [fossil-users] commit command seems to be slow

2011-08-04 Thread Lluís Batlle i Rossell
On Thu, Aug 04, 2011 at 11:12:26AM +0200, Benoit Mortgat wrote: > I am working on a very large fossil repository with approx. 20,000 files in > it and several branches. > > Each time I run “fossil changes” it takes approximately 3 seconds to tell me > what files are missing, deleted, added, or cha

[fossil-users] Freshmeat

2011-07-29 Thread Lluís Batlle i Rossell
I don't see fossil on freshmeat, and sqlite is not update since october 2010. Richard, wouldn't you like to add fossil there? I think it can bring people to the project. Regards, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org htt

[fossil-users] zero artifacts, 6 deltas

2011-07-29 Thread Lluís Batlle i Rossell
Hello, on a fossil sync, I just got this report: Bytes Cards Artifacts Deltas Sent: 130 1 0 0 Received:1504 33 0 0 Sent: 412 7 0 0 Received:9780

Re: [fossil-users] Fossil destroys repositories?

2011-07-29 Thread Lluís Batlle i Rossell
On Fri, Jul 29, 2011 at 02:36:21PM +0200, Stephan Beal wrote: > On Fri, Jul 29, 2011 at 2:23 PM, Antoine Chavasse wrote: > > > On Tue, Jul 26, 2011 at 4:24 PM, Remigiusz Modrzejewski > > wrote: > > > > > > About general reliability: I've never encountered any data > > loss/corruption with Fossil

[fossil-users] diff from to, weird result with 'diff -u' command

2011-07-29 Thread Lluís Batlle i Rossell
Hello, I'm using "fossil diff --from XX --to YY", and the result is that the diff headers for each file refer to random names in /var/tmp, and only at the end I have a list of the files modified (unrelated to the random names). I think it is due to having 'diff-command = diff -u' in the settings.

Re: [fossil-users] Easily linking to events

2011-07-29 Thread Lluís Batlle i Rossell
On Fri, Jul 29, 2011 at 10:24:14AM +0200, Stephan Beal wrote: > 2011/7/29 Lluís Batlle i Rossell > > > For the hooks, I remember as if the only issue was the windows platform. Is > > it > > the only issue? > > > > > LOL! If the "only" issu

Re: [fossil-users] Easily linking to events

2011-07-29 Thread Lluís Batlle i Rossell
On Thu, Jul 28, 2011 at 05:13:16PM -0500, Nolan Darilek wrote: > My Fossil-based project is making a major release tomorrow, and I > decided that warranted an event, particularly since the last such > release was in November. :) I have a download page in the internal wiki, > and I wanted to link

[fossil-users] Links to events

2011-07-26 Thread Lluís Batlle i Rossell
Hello, long ago I opened this issue, about links to events not being resolved (thus appearing in read with no href). http://fossil-scm.org/index.html/tktview?name=b5efc3a47b I don't know if I should open a new issue... but the links still don't work at least for the timeline, checkins, or tiquet

Re: [fossil-users] binary file

2011-07-25 Thread Lluís Batlle i Rossell
On Mon, Jul 25, 2011 at 09:18:32AM -0700, Zhang, Jenny wrote: > Hi, > > I would like to find out if fossil can handle binary file which means > can checkin and checkout a binary file? I use it with any kinds of files without trouble. Just you don't have 'diff' for binary files. __

Re: [fossil-users] Question on short-lived branches in fossil

2011-07-22 Thread Lluís Batlle i Rossell
On Fri, Jul 22, 2011 at 03:14:38PM -0400, Richard Hipp wrote: > On Fri, Jul 22, 2011 at 3:07 PM, Ross Berteig wrote: > > > > > It would be nice if branches had a default color distinct from > > the trunk. ... One way to do that that *might* be ... generate a hash of > > the branch tag > > name an

Re: [fossil-users] changes & status cmds within sub-directory

2011-07-22 Thread Lluís Batlle i Rossell
On Fri, Jul 22, 2011 at 12:36:33PM +0100, Ben Summers wrote: > > On 22 Jul 2011, at 12:03, Lluís Batlle i Rossell wrote: > > > On Sun, Jul 10, 2011 at 01:03:06PM -0400, Martin Gagnon wrote: > >> Le 2011-07-10 à 11:05, Ben Summers a écrit : > >>> Answering

Re: [fossil-users] changes & status cmds within sub-directory

2011-07-22 Thread Lluís Batlle i Rossell
On Sun, Jul 10, 2011 at 01:03:06PM -0400, Martin Gagnon wrote: > Le 2011-07-10 à 11:05, Ben Summers a écrit : > > Answering the question about breaking existing scripts, the output is > > identical when used at the root. Unless you're running scripts in a > > sub-directory, nothing needs to chan

Re: [fossil-users] Avoiding problems with fossil default Makefile (Steve Bennett)

2011-07-21 Thread Lluís Batlle i Rossell
On Thu, Jul 21, 2011 at 09:47:23AM -0400, Martin S. Weber wrote: > On 07/21/11 09:34, Steve Bennett wrote: > > On 21/07/2011, at 10:43 PM, Lluís Batlle i Rossell > > wrote: > >> Just to understand the situation... fossil 1.18 has a broken configure > >> scrip

Re: [fossil-users] Avoiding problems with fossil default Makefile (Steve Bennett)

2011-07-21 Thread Lluís Batlle i Rossell
On Thu, Jul 21, 2011 at 11:34:28PM +1000, Steve Bennett wrote: > On 21/07/2011, at 10:43 PM, Lluís Batlle i Rossell wrote: > > Just to understand the situation... fossil 1.18 has a broken configure > > script, > > right? It fails for me on some syntax problem. > &g

Re: [fossil-users] Avoiding problems with fossil default Makefile (Steve Bennett)

2011-07-21 Thread Lluís Batlle i Rossell
On Thu, Jul 21, 2011 at 08:26:25AM -0400, Richard Hipp wrote: > On Thu, Jul 21, 2011 at 5:33 AM, Steve Bennett wrote: > > > On 21/07/2011, at 5:24 PM, Ben Summers wrote: > > >> > > >> Probably makes sense to rename Makefile to Makefile.classic and > > >> have configure create Makefile from Makefil

[fossil-users] The hooks issue

2011-07-20 Thread Lluís Batlle i Rossell
On Wed, Jul 20, 2011 at 08:18:11PM +0100, Eric wrote: > which leaves us with "should fossil have hooks" which still leads to > complex interface issues. Sorry if I open the issue again... but the only trouble is the Windows platform, on spawning processes without terminals, isn't it? I once point

Re: [fossil-users] Converting from mercurial

2011-07-19 Thread Lluís Batlle i Rossell
On Tue, Jul 19, 2011 at 05:35:13AM -0400, Richard Hipp wrote: > (3) Fossil gives you a "timeline" to help track your project. If Mercurial > does this, I've never seen it. Well, there is 'hgk'. http://mercurial.selenic.com/wiki/HgkExtension Mercurial also comes with a python web script, that give

Re: [fossil-users] Converting from mercurial

2011-07-19 Thread Lluís Batlle i Rossell
On Tue, Jul 19, 2011 at 05:35:13AM -0400, Richard Hipp wrote: > On Tue, Jul 19, 2011 at 12:18 AM, Jeremy Anderson wrote: > > Out of curiosity, why are you converting from mercurial? > Some other possible reasons to prefer Fossil over Mercurial: > ... I agree to all points set by Richard, but apar

Re: [fossil-users] Converting from mercurial

2011-07-19 Thread Lluís Batlle i Rossell
On Mon, Jul 18, 2011 at 09:18:29PM -0700, Jeremy Anderson wrote: > Out of curiosity, why are you converting from mercurial? > > I ask because my friends and I adopted fossil and other friends of ours are > asking us why we didn't go with mercurial instead. I didn't really have a > good answer, apa

[fossil-users] Converting from mercurial

2011-07-18 Thread Lluís Batlle i Rossell
Hello, As the lack of friendlyness I've always felt with git, before using fossil I used mercurial. If I wanted to convert any mercurial repository to fossil, how should do that? Has anyone done that? Regards, Lluís. ___ fossil-users mailing list fossi

Re: [fossil-users] Shun old versions of (large) binary files

2011-07-17 Thread Lluís Batlle i Rossell
On Thu, Jul 14, 2011 at 06:17:07PM +0200, Marco Maggesi wrote: > Hi, > > first of all let me say that fossil is an excellent piece of software. > I use it everyday. > Thank you for developing and supporting fossil. > > I have a small problem and i wonder if it can be easily solved. > (Perhaps wit

Re: [fossil-users] changes & status cmds within sub-directory

2011-07-10 Thread Lluís Batlle i Rossell
On Sun, Jul 10, 2011 at 10:12:33AM -0400, Joshua Paine wrote: > On 7/10/2011 9:11 AM, Ben Summers wrote: > > $ fossil status > > In sub-directory two: > > ADDED world.txt > > EDITED src/display.c > > 1 other change. Use --show-all option to list all changes. > > I would rather it work lik

[fossil-users] sneakernet synchronisation

2011-07-06 Thread Lluís Batlle i Rossell
Hello, is there any way to sychronise two fossil repositories by some sneakernet means, other than having a full repository in the interchanged storage device? Keeping dates as reference, for example. Thank you, Lluís. ___ fossil-users mailing list foss

[fossil-users] The arrows on merge backout

2011-06-30 Thread Lluís Batlle i Rossell
Hello, Having the commits C1, C2, C3 in a row, I see that "merge -backout C3" will end up with the local change "MERGED_WITH C2", and committing the merge will end up with an arrow from C2 to C4. Why there is such an arrow at all? Regards, Lluís. ___ f

Re: [fossil-users] problem importing from git

2011-06-29 Thread Lluís Batlle i Rossell
On Wed, Jun 29, 2011 at 07:08:52AM -0400, John Nowak wrote: > > On Jun 29, 2011, at 4:11 AM, Lluís Batlle i Rossell wrote: > > > On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote: > >> On Jun 29, 2011, at 3:53 AM, John Nowak wrote: > >> >

Re: [fossil-users] problem importing from git

2011-06-29 Thread Lluís Batlle i Rossell
On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote: > On Jun 29, 2011, at 3:53 AM, John Nowak wrote: > > > $ fossil reconstruct foo.fossil . > > fossil: SQLITE_ERROR: table blob already exists > > fossil: table blob already exists > > Just realized I did this wrong. I'm new to fossil obvi

Re: [fossil-users] Can't make gdiff work

2011-06-28 Thread Lluís Batlle i Rossell
On Tue, Jun 28, 2011 at 08:38:28AM -0700, Matt Welland wrote: > Are you using fossil compiled for cygwin or fossil compiled for windows? If > the later then internally it will not know about cygwin paths and may not be > able to launch cygwin binaries (not sure on that one, haven't tested it). I s

Re: [fossil-users] Debugging fossil gdiff & LabVIEW

2011-06-20 Thread Lluís Batlle i Rossell
On Mon, Jun 20, 2011 at 10:16:15AM -0400, Tomek Kott wrote: > Hi folks, > > I'm trying to use fossil in my LabVIEW code development (I already use it > for Matlab, woo hoo!), and started to set up the graphical diff functions > using the meta-diff suite . I set t

Re: [fossil-users] Needed: volunteer to autoconf Fossil

2011-06-16 Thread Lluís Batlle i Rossell
On Thu, Jun 16, 2011 at 08:32:15AM -0400, Richard Hipp wrote: > On Mon, Jun 13, 2011 at 7:07 PM, Steve Havelka wrote: > > > Is it necessary that it's autoconf? Or would you take a CMake-based build > > script? > > > > > > > Though I think autoconf is also necessary (for use by people who do not

[fossil-users] 'configure', a binary blob

2011-06-15 Thread Lluís Batlle i Rossell
I'm happy to see that 'fossil' recognises the configure script in http://fossil-scm.org/index.html/info/57ca24966f as a binary file. That does not require hard AI, but in this case fossil made a good guess. :) ___ fossil-users mailing list fossil-users@

Re: [fossil-users] Needed: volunteer to autoconf Fossil

2011-06-15 Thread Lluís Batlle i Rossell
On Wed, Jun 15, 2011 at 07:04:24PM +1000, Graeme Gill wrote: > Michal Suchanek wrote: > > Autotools can be installed and operated on Windows like most other > > build configuration systems. > > I'm not sure that's possible without installing a UNIX like shell > and set of tools. This is rather for

Re: [fossil-users] Needed: volunteer to autoconf Fossil

2011-06-14 Thread Lluís Batlle i Rossell
On Tue, Jun 14, 2011 at 05:42:49PM +0200, Stephan Beal wrote: > Another suggestion nobody has made yet: jam. It can be distributed in > static-binary form directly with the source tree (i've seen this done in a > couple projects, and i know it can build on some rather obscure systems). i > can't pe

Re: [fossil-users] More merge problems with renames

2011-06-14 Thread Lluís Batlle i Rossell
On Thu, Jun 02, 2011 at 06:24:16AM -0400, Richard Hipp wrote: > 2011/6/2 Lluís Batlle i Rossell > > > > > What do you think about the problem? Do you understand it already, or you > > would > > really like a repository with the troubles, in order to start? &g

Re: [fossil-users] More merge problems with renames

2011-06-02 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: > 2011/6/1 Lluís Batlle i Rossell > > > Hello, > > > > still with the opened issue > > http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, > > we commited such a 'bad

Re: [fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: > 2011/6/1 Lluís Batlle i Rossell > > > Hello, > > > > still with the opened issue > > http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, > > we commited such a 'bad

Re: [fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: > 2011/6/1 Lluís Batlle i Rossell > > > Hello, > > > > still with the opened issue > > http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html, > > we commited such a 'bad

[fossil-users] More merge problems with renames

2011-06-01 Thread Lluís Batlle i Rossell
Hello, still with the opened issue http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html , we commited such a 'bad merge' into one of our branches. As there explained, the 'shortest path' used to calculate the renames was clearly wrong. We decided to go to the previous check

[fossil-users] Worried about merges

2011-05-27 Thread Lluís Batlle i Rossell
Hello, I'm still quite worried on merges, due to the problem I described here some days ago: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html Am I the only one worried on silent bad merges? Thank you, Lluís. ___ fossil-users

Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Lluís Batlle i Rossell
On Wed, May 25, 2011 at 01:43:14AM +0800, Ambrose Bonnaire-Sergeant wrote: > 2011/5/24 Natacha Porté > > > > As a fossil user, I would love to have the option to use Markdown in the > > wiki (with the option of dumbing down to forbid inline HTML which might > > be unsafe -- exactly the same option

Re: [fossil-users] WHY IS FOSSIL REMOVING ALL MY CODE!

2011-05-21 Thread Lluís Batlle i Rossell
On Sat, May 21, 2011 at 02:32:34PM -0400, Richard Hipp wrote: > the "fossil revert" overwrote the undo stack. Maybe to prevent this, I > should implement a multi-level undo? Does anybody have any other > suggestions on how to prevent the lose of uncommitted work? > I've lost sometimes work with

Re: [fossil-users] trouble with 'localauth'

2011-05-06 Thread Lluís Batlle i Rossell
On Fri, May 06, 2011 at 10:42:16PM +0100, Jacek Cała wrote: > The same for me > > fossil new xxx.fossil > fossil ui xxx.fossil > > does not log in me automatically (Opera, Firefox). > > I forgot to add I use x64 win7. Perhaps it matters that this is x64 or > win7 x64. Anyone else with different

[fossil-users] Problems with annotate

2011-05-05 Thread Lluís Batlle i Rossell
Hello, I have problems with annotate giving misleading information. I wrote a ticket: http://fossil-scm.org/index.html/info/f0f9aff371 Maybe asking for a mass 'please try to reproduce it', we can get a public repository which shows the same problem. Regards, Lluís. (Copy of the ticket text belo

Re: [fossil-users] HTML comments in wiki pages

2011-04-28 Thread Lluís Batlle i Rossell
Thank you, Lluís. > On Thu, Apr 28, 2011 at 7:04 AM, Martin Gagnon wrote: > > > 2011/4/28 Lluís Batlle i Rossell : > > > Hello, > > > > > > I try to write text inside wiki files that will not be shown on web > > browsers. > > > > > > I see

[fossil-users] HTML comments in wiki pages

2011-04-28 Thread Lluís Batlle i Rossell
Hello, I try to write text inside wiki files that will not be shown on web browsers. I see that text gets displayed. Shouldn't it better be hidden, as normal html would do? Or there is another way for achieving what I want? Thank you, Lluís. ___ foss

Re: [fossil-users] leaves which i cannot close?

2011-04-22 Thread Lluís Batlle i Rossell
On Fri, Apr 22, 2011 at 11:59:09AM -0400, Richard Hipp wrote: > You might argue that we should change the definition of leaf to be "A node > that as no children of any kind (merge or non-merge) with the same branch > tag." I'm not sure what the consequences of that change would be, but I'm > betti

Re: [fossil-users] Opening a repository on webdav

2011-04-20 Thread Lluís Batlle i Rossell
On Wed, Apr 20, 2011 at 04:11:23PM -0400, Richard Hipp wrote: > On Wed, Apr 20, 2011 at 4:00 PM, Tomek Kott wrote: > > > > So, to the crux of the matter. I set up a new fossil repository (in > > ~/fossil/) using "fossil new site.fossil". I then cd to my mounted drive (cd > > /cygdrive/c/htdocs/) a

Re: [fossil-users] Commit Question

2011-04-07 Thread Lluís Batlle i Rossell
On Thu, Apr 07, 2011 at 02:39:30PM -0500, Bill Burdick wrote: > Are you on *NIX or Windows? If you're on *NIX, you can use fossil commit > $(find dir -type f) or find dir -type f | xargs fossil commit I think it is not that easy! :) fossil commit only likes the files that have changed. > On Thu,

Re: [fossil-users] Fossil on Hammer Principle

2011-03-30 Thread Lluís Batlle i Rossell
On Fri, Mar 25, 2011 at 12:31:09AM -0400, altufa...@mail.com wrote: > It doesn't have ClearCase!!! OMG They may count only free VCS. It lacks monotone though. > -Original Message- > From: Stephen De Gabrielle > To: fossil-users@lists.fossil-scm.org > > Sent: Fri, Mar 25, 2011 1:59 am >

Re: [fossil-users] Summary of i18n status, for inclusion into Fossil introduction wiki

2011-03-29 Thread Lluís Batlle i Rossell
On Wed, Mar 30, 2011 at 01:32:17AM +0900, Clifford Caoile wrote: > Hello fossil-users: > > I was intrigued with Fossil after reading the enthusiastic LWN article > [1]. Unfortunately I do not see any summary about Fossil and > Internationalization (i18n). Let me contribute a summary which can be >

Re: [fossil-users] fossil add somefile.r&s = Error

2011-03-28 Thread Lluís Batlle i Rossell
On Mon, Mar 28, 2011 at 04:33:04PM -0400, sky5w...@gmail.com wrote: > Hi, > I get the following error attempting to add a file with the > Ampersand(&) in the file extension. > Fossil wrote: > 's' is not recognized as an internal or external command, operable > program or batch file. Isn't it your

[fossil-users] changing the date of events

2011-03-14 Thread Lluís Batlle i Rossell
Hello, I tried to create an event for a date different than the one given in the form, and it looks like it does not care on the value of the date field. I see the same editing an event. Does anybody see the same? I'm using Fossil version [1d93222627] 2011-03-01. Thank you, Lluís.

Re: [fossil-users] git equivalent commands

2011-03-11 Thread Lluís Batlle i Rossell
On Fri, Mar 11, 2011 at 06:58:59PM -, Eric wrote: > > On Fri, March 11, 2011 7:27 am, Federico Ramallo wrote: > > Hi, > > > > I was wondering how to do git reset --hard on a fossil repository. Because > > fossil clean only clear extra files, but what about changed files? 'fossil revert' may b

[fossil-users] Annotate for wiki pages

2011-03-11 Thread Lluís Batlle i Rossell
Hello, is there a way I can get an 'annotate' for wiki pages? Thank you, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] [OT] meld-support

2011-03-10 Thread Lluís Batlle i Rossell
On Thu, Mar 10, 2011 at 09:46:59PM +0100, Remigiusz Modrzejewski wrote: > > On Mar 8, 2011, at 19:21 , Lluís Batlle i Rossell wrote: > > >> Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? > > > > I've never used it for 3-way merge;

Re: [fossil-users] cookies for multiple cgis in the same server

2011-03-09 Thread Lluís Batlle i Rossell
On Wed, Mar 09, 2011 at 06:09:28AM -0500, Richard Hipp wrote: > 2011/3/9 Lluís Batlle i Rossell > > > Hello, > > > > we have some fossil repositories served in the same server through > > different CGI > > URLs, and from the version 2011-01-01 to 2011-

[fossil-users] cookies for multiple cgis in the same server

2011-03-09 Thread Lluís Batlle i Rossell
Hello, we have some fossil repositories served in the same server through different CGI URLs, and from the version 2011-01-01 to 2011-03-01 we noticed the change that while with the first version I could have a cookie for each of the repositories at once, and since the last update, logging into on

Re: [fossil-users] meld-support

2011-03-08 Thread Lluís Batlle i Rossell
On Tue, Mar 08, 2011 at 01:15:48PM -0500, Richard Hipp wrote: > > > > Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? > > > > Can meld be plugged into Fossil using the "gmerge-command" setting? > > > > While we're on the subject, should the gmerge-command setting be extend

Re: [fossil-users] meld-support

2011-03-08 Thread Lluís Batlle i Rossell
On Tue, Mar 08, 2011 at 01:12:22PM -0500, Richard Hipp wrote: > On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson > wrote: > > > Hello, > > > > Anyone here using meld[1]? > > > > When merging with many conflicts I find meld to be of invaluable > > help, though I noticed that meld is missing expl

Re: [fossil-users] Cygwin Build

2011-03-05 Thread Lluís Batlle i Rossell
On Sat, Mar 05, 2011 at 05:55:59AM -0800, Anthony Jefferson wrote: > I realize that Cygwin does not build real windows executable. However, I > already have a Cygwin development environment on my desktop and I just wanted > to compile and build the source locally. Is there an existing Cygwin make

Re: [fossil-users] Fossil on IIS

2011-03-04 Thread Lluís Batlle i Rossell
On Fri, Mar 04, 2011 at 04:27:44PM -0600, Tony Perovic wrote: > Q: How should the CGI script invoke Fossil to request these internal > resources? The CGI is quite a defined interface, telling any query information through environment variables, and expecting any answer in stdout. ___

Re: [fossil-users] Strange merge conflicts.

2011-03-04 Thread Lluís Batlle i Rossell
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote: > Several times when making merge with fossil, I ended up with really strange > conflicts like this: > > <<< BEGIN MERGE CONFLICT: original content first <<< > include '%TargetOS%/mouse.asm'=== original content above; conflic

Re: [fossil-users] Hang while waiting for server when using ssh

2011-03-03 Thread Lluís Batlle i Rossell
On Thu, Mar 03, 2011 at 09:35:43PM +0100, Jan Danielsson wrote: > Hello, > >I have run into this problem: > http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/3515 > >Though I'm using NetBSD/amd64 5.0 (client) against a NetBSD/amd64 4.0 > (server). And I'm using key base

Re: [fossil-users] Merges, renames and shortest path.

2011-03-03 Thread Lluís Batlle i Rossell
On Thu, Mar 03, 2011 at 10:57:06AM -0500, Richard Hipp wrote: > 2011/3/3 Lluís Batlle i Rossell > > > On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote: > > > 2011/3/3 Lluís Batlle i Rossell > > > > This could have worked, if the first merge

Re: [fossil-users] Failure in the test

2011-03-03 Thread Lluís Batlle i Rossell
On Thu, Mar 03, 2011 at 10:52:18AM -0500, Richard Hipp wrote: > 2011/3/3 Lluís Batlle i Rossell > > > Hello, > > > > we were updating to fossil of the 1st of March, and running its 'make test' > > we've seen one error: > > > > /tmp/nix-bui

Re: [fossil-users] Merges, renames and shortest path.

2011-03-03 Thread Lluís Batlle i Rossell
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote: > 2011/3/3 Lluís Batlle i Rossell > > This could have worked, if the first merge of the end of January did not > > have > > any rename. It had renames, and due to this, the last merge attempt > > complain

[fossil-users] Failure in the test

2011-03-03 Thread Lluís Batlle i Rossell
Hello, we were updating to fossil of the 1st of March, and running its 'make test' we've seen one error: /tmp/nix-build-ry80yizb2mhli5yr7la7by5dn8w6cjdd-fossil-20110301190432.drv-0/fossil-src-20110301190432/fossil test-3 t1 t2 t3 a23 test merge1-7.2 FAILED! Richard, can you look at it? Thank you

[fossil-users] Merges, renames and shortest path.

2011-03-03 Thread Lluís Batlle i Rossell
Hello, we had an issue merging with renames here. The 'test-shortest-path' takes what we think is a *WRONG* path for the merge to happen. We had two long-standing branches, that both were updated from trunk from time to time. One was merged into trunk only recently, altough it has been there for

Re: [fossil-users] A helper function I have for a shorter commandline

2011-03-02 Thread Lluís Batlle i Rossell
On Wed, Mar 02, 2011 at 09:05:55AM -0800, Andreas Kupries wrote: > > http://paste.tclers.tk/2370 Hello, "$@" is what you want for quoting arguments maintaining spaces. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-

Re: [fossil-users] Restricting trunk checkins

2011-02-22 Thread Lluís Batlle i Rossell
On Tue, Feb 22, 2011 at 07:09:14AM +0200, Ron Aaron wrote: > One feature "missing" from Fossil is a way to restrict checkins on the > 'trunk' > (or other branch) to certain people. > > This is necessary in a group where the methodology is for a "gatekeeper" to > approve integration into the mai

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-21 Thread Lluís Batlle i Rossell
On Mon, Feb 21, 2011 at 08:23:42AM -0500, Richard Hipp wrote: > Just to clearify, by "3-way merge", you mean a graphical merging tool? I > ask because Fossil always has done a 3-way merge behind the scenes - it just > doesn't show you what it is doing or give you the opportunity to intervene. I i

Re: [fossil-users] SSH status

2011-02-17 Thread Lluís Batlle i Rossell
On Thu, Feb 17, 2011 at 11:42:19AM +0100, Stephan Beal wrote: > 2011/2/17 Lluís Batlle i Rossell > i have a bashrc configured on that box, which includes ~/bin in my path, and > my bash_profile simply sources bashrc, but the hoster has apparently done > something to their ssh which

Re: [fossil-users] SSH status

2011-02-17 Thread Lluís Batlle i Rossell
On Thu, Feb 17, 2011 at 11:04:12AM +0100, Stephan Beal wrote: > On Wed, Feb 16, 2011 at 6:25 PM, Richard Hipp wrote: > > > My current approach is to run ssh to a shell on the remote side and then > > issue shell command over the wire that invoke Fossil multiple times to act > > as a server for th

Re: [fossil-users] SSH status

2011-02-16 Thread Lluís Batlle i Rossell
On Wed, Feb 16, 2011 at 02:36:16PM -0500, Richard Hipp wrote: > On Wed, Feb 16, 2011 at 12:03 PM, Chad Perrin wrote: > > > I'm new to this list. Be gentle. > > > > I've been rummaging through the list archives, and sifting through the > > Web documentation, but I am still not clear on the status

Re: [fossil-users] raw (internal) wiki pages

2011-02-16 Thread Lluís Batlle i Rossell
On Wed, Feb 16, 2011 at 04:19:08PM -0500, Ron Wilson wrote: > For a wiki page created through the UI, is there an URL to access the raw > page? > > I tried replacing "/wiki?name=mywikipage" with "/raw?name=mywikipage", > but that did not work. This is related: http://www.fossil-scm.org/index.htm

Re: [fossil-users] SSH status

2011-02-16 Thread Lluís Batlle i Rossell
On Wed, Feb 16, 2011 at 02:36:16PM -0500, Richard Hipp wrote: > OK, so I've made some tweaks to the SSH code based on the many helpful > suggestions sent in by readers. (Thanks!) Now the ball is back over to > you, Chad. Go forth and test. Let us know about both your successes and > failures.

Re: [fossil-users] SSH status

2011-02-16 Thread Lluís Batlle i Rossell
On Wed, Feb 16, 2011 at 01:04:56PM -0500, Richard Hipp wrote: > On Wed, Feb 16, 2011 at 12:36 PM, Justin Mazzi wrote: > > > What about using regular pipes? > > > > exec ssh remote-server 'fossil command to output raw server data' | fossil > > receive data > > > > Multiple round-trips from clien

Re: [fossil-users] SSH status

2011-02-16 Thread Lluís Batlle i Rossell
On Wed, Feb 16, 2011 at 12:25:11PM -0500, Richard Hipp wrote: > On Wed, Feb 16, 2011 at 12:03 PM, Chad Perrin wrote: > If any reader has suggestions on a better way to do SSH access for Fossil, > please speak up. What do you think about what I suggested some time ago in http://www.fossil-scm.org/

[fossil-users] More consideration for the local changes

2011-02-11 Thread Lluís Batlle i Rossell
Hello, I think that the current fossil implementation uses good techniques for ensuring that the data is properly saved into the repository. Even "Robust & Reliable" appear as head words in the front page. Nevertheless, while I see a lot of care for the repository contents, I see little care for

[fossil-users] New issue with baseline/delta manifests

2011-02-11 Thread Lluís Batlle i Rossell
Hello, I've made a checkin, and the UI shows as if I have not done any change in any file. The checkin has a delta manifest. I think that the problem is that, the baseline manifest (the delta is based on) has the same contents for the file as those I've committed, although in the other deltas bet

Re: [fossil-users] More on the delta/baseline problem synching

2011-02-10 Thread Lluís Batlle i Rossell
before the release, but we've been incredibly busy at the office, with many extra hours involved. I've been a bit late. Bye, Lluís > 2011/2/10 Lluís Batlle i Rossell > > > On Thu, Feb 10, 2011 at 09:44:20PM +0100, Lluís Batlle i Rossell wrote: > > > Hello, > >

Re: [fossil-users] More on the delta/baseline problem synching

2011-02-10 Thread Lluís Batlle i Rossell
On Thu, Feb 10, 2011 at 09:44:20PM +0100, Lluís Batlle i Rossell wrote: > Hello, > > as I have a repository where I have reproduced the problem > http://fossil-scm.org/index.html/tktview?name=fbea61caf0 , I'm investigating a > bit. > > I found this: > sqlite> .sch

[fossil-users] More on the delta/baseline problem synching

2011-02-10 Thread Lluís Batlle i Rossell
Hello, as I have a repository where I have reproduced the problem http://fossil-scm.org/index.html/tktview?name=fbea61caf0 , I'm investigating a bit. I found this: sqlite> .schema orphan CREATE TABLE orphan( rid INTEGER PRIMARY KEY, baseline INTEGER ); CREATE INDEX orphan_baseline O

Re: [fossil-users] Fossil release pending

2011-02-10 Thread Lluís Batlle i Rossell
On Wed, Feb 09, 2011 at 09:08:39AM -0500, Richard Hipp wrote: > 2011/2/9 Lluís Batlle i Rossell > > > On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > > > I haven't done an official build of Fossil on a long while. So I'll try > > to > >

Re: [fossil-users] Fossil release pending.

2011-02-09 Thread Lluís Batlle i Rossell
On Wed, Feb 09, 2011 at 09:08:39AM -0500, Richard Hipp wrote: > 2011/2/9 Lluís Batlle i Rossell > > > On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > > > I haven't done an official build of Fossil on a long while. So I'll try > > to > >

Re: [fossil-users] Fossil release pending.

2011-02-09 Thread Lluís Batlle i Rossell
On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > I haven't done an official build of Fossil on a long while. So I'll try to > do one on Wednesday. Please let me know if you see any serious problems > with the current tip of trunk. We are hitting this now. I just reported the ticke

Re: [fossil-users] Fossil release pending.

2011-02-07 Thread Lluís Batlle i Rossell
Hello Richard, On Mon, Feb 07, 2011 at 07:02:26PM -0500, Richard Hipp wrote: > 2011/2/7 Lluís Batlle i Rossell > > > On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > > > I haven't done an official build of Fossil on a long while. So I'll try &

Re: [fossil-users] Fossil release pending.

2011-02-07 Thread Lluís Batlle i Rossell
On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > I haven't done an official build of Fossil on a long while. So I'll try to > do one on Wednesday. Please let me know if you see any serious problems > with the current tip of trunk. I also hit troubles here, under reports claimed to

Re: [fossil-users] Fossil release pending.

2011-02-07 Thread Lluís Batlle i Rossell
On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: > I haven't done an official build of Fossil on a long while. So I'll try to > do one on Wednesday. Please let me know if you see any serious problems > with the current tip of trunk. > > Note that I am unable to reproduce the sync pr

Re: [fossil-users] value of a just added column

2011-02-05 Thread Lluís Batlle i Rossell
On Fri, Feb 04, 2011 at 08:01:28PM -0500, Ron Wilson wrote: > I added a new column to my tickets table, one that I want to use in > the WHERE clause of a SELECT. However, I am unable to devise an > expression that matches, on the new column, any of the records that > existed before the new column w

Re: [fossil-users] Deploying A Web Application with Fossil and FTP

2011-02-04 Thread Lluís Batlle i Rossell
On Fri, Feb 04, 2011 at 06:12:46PM +0100, Ondrej Nemecek wrote: > > Hi to all, > > let say we have web site, which sources are managed using fossil. This > web site is running on server and document root can be accessed via ftp. > > Is there some way to use fossil to deploy changed files to ser

Re: [fossil-users] newbie failing to log into server...

2011-02-03 Thread Lluís Batlle i Rossell
On Thu, Feb 03, 2011 at 08:15:26PM +0100, Stephan Beal wrote: > 2011/2/3 Lluís Batlle i Rossell > > > If you don't use a root account for your CGI, you can use a setuid program > > for > > it to have such access to your files. Something like this here explained,

Re: [fossil-users] newbie failing to log into server...

2011-02-03 Thread Lluís Batlle i Rossell
On Thu, Feb 03, 2011 at 01:36:59PM -0500, Mike Meyer wrote: > However, if I try and log in using the userid/password from the repo, > I get > > SQLITE_CANTOPEN: cannot open file at line 27596 of [fabcb6b95e] > > SQLITE_CANTOPEN: statement aborts at 28: [UPDATE user SET > cookie='1/6E8AD0C7D6B7C

[fossil-users] fossil ui, making web non-admin operations

2011-01-29 Thread Lluís Batlle i Rossell
Hello, we use to share some fossil repository files with the coworkers, and we simply set the committer user name in "fossil user default XXX". Running 'fossil ui', I cannot change the web user logged in, and it takes that of the repository administrator. Maybe what I have to do is to use 'fossi

Re: [fossil-users] Bug at baseline/delta manifests, workaround using 'rebuild'

2011-01-26 Thread Lluís Batlle i Rossell
On Tue, Jan 25, 2011 at 07:36:49PM +0100, Lluís Batlle i Rossell wrote: > Hello, > > I updated the fossil version I had in one computer from 2010-11-17 to > 2011-01-13. I run the fossil rebuild (Btw, it said 100.1% completed at the > end), > and synched to the main reposito

[fossil-users] Bug at baseline/delta manifests, workaround using 'rebuild'

2011-01-25 Thread Lluís Batlle i Rossell
Hello, I updated the fossil version I had in one computer from 2010-11-17 to 2011-01-13. I run the fossil rebuild (Btw, it said 100.1% completed at the end), and synched to the main repository. I noticed that the timeline was showing all the changes until today at ~15:00 in trunk, but was not sho

Re: [fossil-users] error on push

2011-01-25 Thread Lluís Batlle i Rossell
On Tue, Jan 25, 2011 at 10:20:06AM -0500, Bill Whiting wrote: > Dmitry, > I checked the permissions. I am not running this from apache, fossil is > launched from xinetd, so the fossil process is owned by the same user > that owns the fossil repository file. I don't think this is generally true.

[fossil-users] cannot access baseline manifest

2011-01-25 Thread Lluís Batlle i Rossell
Hello, On a "fossil update trunk", I got this output: $ fossil update trunk Autosync: http://blabla@blabla/blabla Bytes Cards Artifacts Deltas Sent: 130 1 0 0 Received:4494 97 0 0 Sent:1540 31

[fossil-users] Conflict on binary files

2011-01-25 Thread Lluís Batlle i Rossell
Hello, I think fossil handles bad the conflicts on binary files. Basically, it overwrites the file in case of conflict, expecting the user to do "undo" for planing a later conflict resolution. I think this can end up in lost changes in the working directory too easily. What about the approach of

<    1   2   3   4   5   6   >