Re: [fossil-users] Enhancement: commit and close merged leaf
2013/7/11 Harald Oehlmann harald.oehlm...@elmicron.de: Looks really helpful and well thought (but I am even more in Stephans position to stay quiet due to big lack of understanding...) Implementation is complete now and well-tested in the merge-integrate branch. Feedback welcome! Closing a branch could also be done in the command line with: fossil tag add --raw closed branch but this lacks the necessary checks whether branch is a leaf or maybe already closed. fossil merge --integrate has those checks now. 2013/7/10 Harald Oehlmann harald.oehlm...@elmicron.de: Am 10.07.2013 11:51, schrieb Stephan Beal: On Wed, Jul 10, 2013 at 9:37 AM, Harald Oehlmann harald.oehlm...@elmicron.de mailto:harald.oehlm...@elmicron.de wrote: 1) fossil open repo 2) fossil merge branch 3) fossil commit 4) And then, I go to the web interface and set the closed leaf property of the branch. The last step would be natural for me to de done with the fossil commit. ... It is ok to also initiate it with the fossil merge and do it with fossil commit. The fact to specify it with fossil merge has two advantages: - the closed branch tag is directly in the command, which is clearer - multiple merges may be closed or not by one commit. The current implementation does that exactly. The above steps become: 1) fossil open repo 2) fossil merge --integrate branch 3) fossil commit The merged branch is only closed when the merge is actually committed. So if the used does a fossil undo or fossil revert the branch is kept as if the fossil merge --integrate never happened. And you can do multiple integrations this way before doing a commit: All integrated branches will be closed at commit time. 2013/7/10 Stephan Beal sgb...@googlemail.com: i think i just went from glass half full to glass half empty on this topic :/. Well, just try out the merge-integrate branch. I would say the glass is full again.;-) Regards, Jan Nijtmans ___ 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] Enhancement: commit and close merged leaf
Am 12.07.2013 10:25, schrieb Jan Nijtmans: Well, just try out the merge-integrate branch. I would say the glass is full again.;-) Congratulation, very impressive ! - Harald ___ 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] SSH client updates.
On Fri, Jul 12, 2013 at 3:15 AM, Matt Welland estifo...@gmail.com wrote: My vote is to go with the new behaviour only. More options usually means more pain - albeit after getting though any transition troubles. +1 -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] SSH client updates.
On 2013-07-12 01:49, Andy Bradford wrote: Thus said Rene on Thu, 11 Jul 2013 22:31:48 +0200: I would prefer to not have that option. test-http is for testing a new transport method. If you give someone read acces to your ssh repo then test-http circumvents that. In fact test-htp makes you while connected setup user I agree with you on this sentiment. Does this also mean, however, that you would prefer to remove the original clone behavior entirely? Right now, the original behavior is preserved by default: fossil clone ssh://amb@remote//tmp/test.fossil test.fossil Will invoke a remote shell via SSH, go through the echo/reply probes, and then finally launch ``fossil test-http /tmp/test.fossil''. Should this option be removed entirely? Should it be changed instead to go through the same echo/reply probes, but then finally call ``fossil http /tmp/test.fossil'' instead? Or should the default behavior be replaced with simply issuing a remote ``fossil http /tmp/test.fossil'' as I now do using the -h http option? My vote would be to remove the original behavior, and replace it with simply running a remote ``fossil http /tmp/test.fossil'' and not worry about shell issues. But, that does introduce one difference in behavior on clones---because the ``fossil http'' command outputs a Connection: close header in the response, each interaction during the clone will invoke a new SSH command. This isn't necessarily a problem for people who are using SSH keys, but you will be prompted for a password each time if you aren't using a key. This may not be so bad, however, because I believe autosync already behaves this way, so really, it's only the cloning operation that would change in behavior. Perhaps a poll is in order. Thanks for the feedback. Andy -- TAI64 timestamp: 400051df44b5 I prefer the new way and do remove the old way -- Rene ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] homepage (first wiki page) for a repository
Hello, is homepage for repository same thing as as home page for wiki? I had created a new repository wiki.fossil and had set project name to wiki and name of home page to /MyStartingPage. URL http://localhost:8108 is putting me to http://localhost:8108/MyStartingPage home button on third line is putting me also to http://localhost:8108/MyStartingPage I had created MyStartingPage wiki page, but the content is not showed on http://localhost:8108/MyStartingPage It looks like I have to anyway create [wiki] page for the index page. What I shall do to have content of [MyStartingPage] shown on first page? Thank you, Jiri Fossil version [8db6f9877f] 2013-06-22 21:45:06 -- Jiri Navratil, http://www.navratil.cz, +420 777 224 245 ___ 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] homepage (first wiki page) for a repository
On Sat, Jul 13, 2013 at 12:31 AM, Jiri Navratil j...@navratil.cz wrote: is homepage for repository same thing as as home page for wiki? By default, yes, but you can change that in the configuration. I had created a new repository wiki.fossil and had set project name to wiki and name of home page to /MyStartingPage. URL http://localhost:8108 is putting me to http://localhost:8108/MyStartingPage home button on third line is putting me also to http://localhost:8108/MyStartingPage I had created MyStartingPage wiki page, but the content is not showed on http://localhost:8108/MyStartingPage It looks like I have to anyway create [wiki] page for the index page. i think you need /wiki/MyStartingPage instead. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] homepage (first wiki page) for a repository
On Fri, Jul 12, 2013 at 6:31 PM, Jiri Navratil j...@navratil.cz wrote: Hello, is homepage for repository same thing as as home page for wiki? It can be. But you can set up the homepage for the repository anyway you want. (1) Under Admin/Configuration you can select any page you want to be the homepage. For example, you might put in /timeline to make the timeline be your homepage. (That's what SQLite does). Or you /doc/trunk/www/index.wiki to make the document you have checked in under the name www/index.wiki be the homepage. (That's what Fossil does.) (2) You can also modify what the Home link on the menu bar goes to by editing the HTML found at Admin/Header. I had created a new repository wiki.fossil and had set project name to wiki and name of home page to /MyStartingPage. URL http://localhost:8108 is putting me to http://localhost:8108/MyStartingPage home button on third line is putting me also to http://localhost:8108/MyStartingPage I had created MyStartingPage wiki page, but the content is not showed on http://localhost:8108/MyStartingPage It looks like I have to anyway create [wiki] page for the index page. What I shall do to have content of [MyStartingPage] shown on first page? Thank you, Jiri Fossil version [8db6f9877f] 2013-06-22 21:45:06 -- Jiri Navratil, http://www.navratil.cz, +420 777 224 245 ___ 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
