[fossil-users] More merge problems with renames
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 checkin, merge again, fix manually whatever rename got wrong (we still can handle the amount of renames, luckily), and commit as a 2nd leaf for the branch, for later closing of the broken merge. To our surprise, now the 'shortest-path' goes through the commit *after* the checkin I'm merging into. So, apart from the broken behaviour on renames, should I shun 'bad' commits so merges don't try to use them as shortest paths? I think the problem is in too-much-simplicity of the shortest path algorithm used for the renames on merges. Regards, 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] More merge problems with renames
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? We decided to go to the previous checkin, merge again, fix manually whatever rename got wrong (we still can handle the amount of renames, luckily), and commit as a 2nd leaf for the branch, for later closing of the broken merge. To our surprise, now the 'shortest-path' goes through the commit *after* the checkin I'm merging into. So, apart from the broken behaviour on renames, should I shun 'bad' commits so merges don't try to use them as shortest paths? I think the problem is in too-much-simplicity of the shortest path algorithm used for the renames on merges. Regards, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- 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] 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? No, I'msorry, it's private code. ___ 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
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? Just to add some information... If you doubt how renames could be lost, depending on the path taken... I think it may be related to (look at the last post I wrote there on January): http://fossil-scm.org/index.html/tktview?name=74413366fe Regards, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Help install fossil as window service
Hi, I'm trying to install fossil as a window service. i sucessfully created the service with this command sc create fossil binPaht="GoodPath\fossil.exe server" but when i start the fossil service i get this error Error1053: Theservicedid not respond to the start or control request in a timely fashion. What did i do wrong ? -- Cordialement, Steeve St-Laurent - Programmeur Logiciels INFO-DATA inc. Courriel : sstlaur...@infodata.ca Qubec : 418-836-9719 (203) / Montral : 514-907-0991 Horaire disponible : Du Lundi au Vendredi de 8h30-12h00 13h00-17h00 *** Avis de confidentialit: Ce courriel (y compris les pices qui y sont annexes, le cas chant) est strictement rserv l'usage de la personne ou de l'entit laquelle il est adress et peut contenir de l'information privilgie et confidentielle. Toute divulgation, distribution, reproduction ou autre utilisation non autorise de ce courriel est strictement prohibe. Si vous n'tes pas le destinataire de ce document, veuillez en informer l'expditeur et le supprimer immdiatement. *** ___ 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
Steeve St-Laurent schrieb: Hi, Hello, I'm trying to install fossil as a window service. i sucessfully created the service with this command sc create fossil binPaht=GoodPath\fossil.exe server hmmm ... I do not know Windows. But you probably misspelled binPaht? Shouldn't this read binPath perhaps? (...) Ciao, chi :-) ___ 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
On Wed, Jun 1, 2011 at 6:50 PM, chi ml-fos...@qiao.in-berlin.de wrote: sc create fossil binPaht=GoodPath\fossil.exe server hmmm ... I do not know Windows. But you probably misspelled binPaht? Shouldn't this read binPath perhaps? And doesn't \f need to be double-escaped? GoodPath\\fossil...? (i might be wrong - haven't written a batch file since last millennium, and \f normally means form feed.) -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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
On 01.06.2011 17:37, Steeve St-Laurent wrote: Hi, I'm trying to install fossil as a window service. i sucessfully created the service with this command sc create fossil binPaht=GoodPath\fossil.exe server but when i start the fossil service i get this error *Error* 1053: The *service* did not respond to the start or control request in a timely fashion. What did i do wrong ? You can't register an arbitrary program directly as a Windows service. Every Windows service has to implement at least two functions which are called by the service manager to start and stop the service. Fossil obviously does not implement those functions, so it doesn't respond to the service manager as expected. There are programs available which implement those functions and can then run an arbitrary program. Just do a search for run windows program as a service Ingo ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
