Re: [fossil-users] More merge problems with renames
On Wed, Jun 01, 2011 at 07:35:09AM -0400, Richard Hipp wrote: 2011/6/1 Lluís Batlle i Rossell virik...@gmail.com 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. Can you send me the repo file? 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? I'd have to recreate one artificially, to show the problems, as I've only seen that in the private repository we use (which we use extensively). ___ 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] More merge problems with renames
2011/6/2 Lluís Batlle i Rossell virik...@gmail.com 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? I'd have to recreate one artificially, to show the problems, as I've only seen that in the private repository we use (which we use extensively). Please send a reproducible test case if you can. -- D. Richard Hipp d...@sqlite.org ___ 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] Help install fossil as window service
Hi Steeve, I recently installed fossil as a Windows service on my own PC. You need a utility like Srvany or (like I did) NSSM to do that. Here are the steps that I took: To arrange this on a Windows box, do the following: Put all repository-files in one single directory (e.g. C:\fossil) , and set the extensions for all repository-files to '.fossil'. (See also: the Fossil server command). You can then start a server manually, e.g. by typing the command fossil server c:\fossil However, you can also install this command as a Windows service, using a utility like Srvany or Nssm. This has the advantage that you don't need to type the command everytime you start up your PC, and that you can not stop the server by accident (by closing all windows in the taskbar) Installing the service using NSSM Enter the command nssm install fossilsrv c:\bin\fossil.exe server c:\fossil ( I also remember having done some manual registry tweaks, but I cannot recall them exactly anymore. Anyhow, the relevant registry settings should look as shown below. ) === Registry settings [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\fossilsrv] ImagePath=C:\bin\nssm.exe run [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\fossilsrv\Parameters] AppDirectory=c:\fossil Application=c:\bin\fossil.exe AppParameters=server c:\fossil [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\fossilsrv\Parameters\AppExit] @=Restart == End of registry settings Kind regards, Jos van Kesteren ___ 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] Help install fossil as window service
Hi, Thanks everyone for such a fast help, I sucessfully installed fossil as windows service. -- Steeve ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Testing new features
I've created a new branch, ben-testing, with the new features I've been working on. I'm going to be using this version from now on to make sure it's well tested before it's considered for merging into trunk. It adds: * SSL client certificate support * Versionable settings (eg specify ignore-glob as the file .fossil-settings/ignore-glob) * empty-dirs setting, for creating empty directories on update or checkout I'd appreciate any help in testing it, and feedback on the implementation. Unless you want to use empty-dirs as a non-versioned setting, you can use a normal release on the server. I'll keep the branch up to date with releases as they're made. To get started with the settings changes, type fossil help settings, and for the SSL certs, connect to a server which requests a client certificate for instructions, or type fossil help clone. Thanks! Ben -- http://bens.me.uk/ ___ 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] ssl certificates
On 05/31/11 09:47, Steve Landers wrote: I've been quite happily using fossil over https until yesterday, when my SSL certificate was due to expire and rather than renew it, I purchased another one for the domain. This meant the installed certificate was different that the previous one, and now I'm getting the WARNING: Certificate doesn't match the saved certificate for this host! message on all operations that touch the server. When prompted to Accept certificate [a=always/y/N]? I answer always, but I am still prompted each time. I tried re-setting the remote url using fossil remote-url but still the same. I search of the mailing list archives didn't point out anything obvious to me, but I do admit I might have skimmed over useful insights. So, before I code dive can anyone shed any light on what (if anything) is wrong. Including my expectations? It's probably related to: http://www.fossil-scm.org/index.html/info/727af73f46 I don't remember the details, but I think the problem is that if some sort of SSL verification error occurs, it doesn't reach the function which is supposed to cache the server certificate (even if you've told it to do so). It may be that because the old server certificate is cached, a mismatch occurs, and the new one isn't cached over the old one. (Again, I'm not sure I remember all the details). If you manually remove the cached server certificate using the sqlite3 command, you may be able to unconditionally cache the new server certificate. -- Kind regards, Jan Danielsson signature.asc Description: OpenPGP digital signature ___ 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] Testing new features
On 06/02/11 22:05, Ben Summers wrote: I've created a new branch, ben-testing, with the new features I've been working on. I'm going to be using this version from now on to make sure it's well tested before it's considered for merging into trunk. It adds: * SSL client certificate support [---] See http://www.fossil-scm.org/index.html/timeline?r=jan-clientcert for alternative SSL client certificate support. My client certificate system works as follows: Step 1: Create a certificate bundle (stored in the global database): $ fossil cert add myfoo --key ~/.certs/myid.key --cert ~/.certs/myid.crt --cafile ~/.certs/foo-ca.crt Step 2: Clone using the bundle $ fossil clone --certbundle myfoo https://repos.foo.org/projects/projectX projectx.fossil Fossil has now made an implicit association between the URL repos.foo.org and the user's certificate bundle myfoo. One can see this using the cert list sub-command: $ fossil cert list myfoo ckey=/home/anonymous/.certs/myid.key ckey=/home/anonymous/.certs/myid.crt cafile=/home/anonymous/.certs/foo-ca.crt Associations repos.foo.org What this means is that any time the user uses https to access repos.foo.org, fossil will automatically use the certificate bundle myfoo. Should one want to break the association, without removing the certificate bundle, use the command: $ fossil cert disassociate repos.foo.org Each time one uses clone/push/pull/sync with the --certbundle option, the implicit association will be made. Finally, if one would need to remove the certificate bundle, and all its associations, use the command: $ fossil cert delete myfoo -- Kind regards, Jan Danielsson signature.asc Description: OpenPGP digital signature ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
