Re: [fossil-users] More thoughts on locks
This is my favorite approach so far- simple, straightforward, and no complications related to offline commits or someone forgetting to remove a lock. On Thu, Oct 20, 2011 at 2:07 PM, Mike Meyer m...@mired.org wrote: On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment ch...@ononbb.comwrote: I'm a novice Fossil user working in a small group with need to track both text and binary files. It seems to me that locks are nice to have for text files since 3 way diffs can be merged at relatively little cost. But inability to merge binary files might mean painful hand merging based on side by side comparisons for word processing documents or presentation slides, or based on repeating the edits for image files. So a lock would provide immediate warning when attempting checkout that someone else is probably touching the file. Out of band communication would be needed to gain access - not a bad thing and better than proceeding blindly. The problem is that locking in a distributed environment is hard to do reliably. Mostly reliable could well be worse than no locking at all: you start to depend on it, and it will then naturally fail at the worst possible moment. How about an having a way to flag files - when created - as read-only or some such. (I think someone else may have suggested this). Such files would be checked out read only, and would require a -force to commit. A new readonly-glob setting would help - causing files that matched it to be flagged as such along the way. The goal is not to have locks as such, but to alert people to the fact that a file requires out-of-band communications before it gets changed and/or committed. mike ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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] Why do people create branches as a separate step? Was: Unable to sign manifest
I agree with the others, I usually start a branch as a part of the process of working on some new feature. It just feels more organized than remembering to decide what branch to use when I finally commit, or changing the branch after the fact. 2011/8/9 Lluís Batlle i Rossell virik...@gmail.com On Tue, Aug 09, 2011 at 10:58:02AM -0400, Richard Hipp wrote: On Tue, Aug 9, 2011 at 10:28 AM, tpero...@compumation.com tpero...@compumation.com wrote: (1) fossil branch new new-branch I forgot to add that I don't like this approach *also* because it does not let me type teh message that will appear in the timeline. So even I wanted to declare some intentions for the time record, I would not use this because I can't type what will appear there. But of course, having -b, even having the writing feature I would not use it. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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] Why do people create branches as a separate step? Was: Unable to sign manifest
Is there a way to do in from the command line? 2011/8/9 Lluís Batlle i Rossell virik...@gmail.com On Tue, Aug 09, 2011 at 01:01:55PM -0500, tpero...@compumation.com wrote: So, how do you move commits in the trunk to a new branch after the fact. Open the UI, click the checkin, then edit... and check the part about starts a new branch. Regards, Lluís. -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto: fossil-users-boun...@lists.fossil-scm.org] On Behalf Of Joshua Paine Sent: Tuesday, August 09, 2011 10:10 AM To: fossil-users@lists.fossil-scm.org Subject: Re: [fossil-users] Why do people create branches as a separate step? Was: Unable to sign manifest On 8/9/2011 10:58 AM, Richard Hipp wrote: Change the subject: Please help me to understand why people want to create a new branch before adding changes to that branch, rather than just waiting until they check-in their edits? In SVN (and possibly others), you have to create the branch first. In Git I still try to make the branch first, because I don't know how to move a commit to a new branch if I forget to add the new branch argument when I commit. The GUI tools I've used for SVN and Git didn't make it easy to put a commit on a new branch. In fossil I often just work and worry about branches later, sometimes several commits later, because I know it's really easy to change it. In those cases, I've usually started working on something and realized part way in that I had better branch for this--a totally stress-free realization with fossil. But sometimes I still make the branch first, because sometimes my thought process begins with Now I'm going to start on New Feature X, and since I've just decided that, I may as well make some manifestation of my intention. I like that both ways are supported, along with the ability to make new branches after the fact. -- Joshua Paine LetterBlock: Web Applications Built With Joy http://letterblock.com/ 301-576-1920 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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] UnQL?
You sure jumped on that story fast! I'm not Dr. Hipp, but since Fossil is based on a relational database while UnQL is designed for non-relational databases, I doubt we'll see an UnQL interface. Since UnQL is designed to mimic SQL, I'm not even sure what the gain would be. On Fri, Jul 29, 2011 at 1:57 PM, Stephen De Gabrielle stephen.degabrie...@acm.org wrote: Hi, Is there an UnQL query interface for fossil in the works? Stephen http://www.unqlspec.org/display/UnQL/Home http://fossil-scm.org/index.html/doc/trunk/www/theory1.wiki -- -- Stephen De Gabrielle stephen.degabrie...@acm.org Telephone +44 (0)20 85670911 Mobile+44 (0)79 85189045 http://www.degabrielle.name/stephen ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Fossil not removing files when switching branches
When I switch between branches Fossil isn't removing files that belong to the previous branch but not the current branch. Am I doing something wrong? Example: === $ fossil new prj.fossil project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-id: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc admin-user: spiffy (initial password is efa50e) $ fossil open prj.fossil $ touch new_file $ fossil add new_file ADDED new_file $ fossil commit -m added a file New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb $ fossil branch new branch2 trunk gpg: no default secret key: secret key not available gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not available unable to sign manifest. continue (y/N)? y New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f $ fossil close $ fossil open prj.fossil branch2 project-name: unnamed repository: /tmp/tmp_project/prj.fossil local-root: /tmp/tmp_project/ project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-code: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55 UTC parent: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36 UTC tags: branch2 comment: Create new branch named branch2 (user: spiffy) $ ls _FOSSIL_ new_file prj.fossil $ touch file2 $ fossil add file2 ADDED file2 $ fossil commit -m Added another file New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a $ fossil close $ fossil open prj.fossil project-name: unnamed repository: /tmp/tmp_project/prj.fossil local-root: /tmp/tmp_project/ project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-code: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36 UTC parent: 259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13 18:42:54 UTC child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55 UTC tags: trunk comment: added a fdle (user: spiffy) $ ls file2 _FOSSIL_ new_file prj.fossil === file2 should not appear when I am viewing the trunk branch because it doesn't exist there- it only exists in the branch2 branch. ___ 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] Fossil not removing files when switching branches
Yep, that does the trick. I'd seen the update command but didn't realise this was its purpose. Should fossil close/open behave differently from fossil update? Is this a bug in Fossil, or is it deliberate? On Wed, Jul 13, 2011 at 3:20 PM, Andreas Kupries andre...@activestate.comwrote: On 7/13/2011 12:14 PM, Tomek Kott wrote: I think the issue is that fossil close doesn't clear out the directory, and fossil open I only overwrites files from the opened checkout, but does not delete any files. So if you were to issue fossil extras my guess is file2 would be in that list. To change branches it is not necessary to 'close' the workspace. Just do fossil update branchname That will properly remove/add/update the files in the workspace. Tomek On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham spiffyt...@gmail.com mailto:spiffyt...@gmail.com wrote: When I switch between branches Fossil isn't removing files that belong to the previous branch but not the current branch. Am I doing something wrong? Example: === $ fossil new prj.fossil project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-id: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc admin-user: spiffy (initial password is efa50e) $ fossil open prj.fossil $ touch new_file $ fossil add new_file ADDED new_file $ fossil commit -m added a file New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb $ fossil branch new branch2 trunk gpg: no default secret key: secret key not available gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not available unable to sign manifest. continue (y/N)? y New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f $ fossil close $ fossil open prj.fossil branch2 project-name: unnamed repository: /tmp/tmp_project/prj.fossil local-root: /tmp/tmp_project/ project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-code: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55 UTC parent: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36 UTC tags: branch2 comment: Create new branch named branch2 (user: spiffy) $ ls _FOSSIL_ new_file prj.fossil $ touch file2 $ fossil add file2 ADDED file2 $ fossil commit -m Added another file New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a $ fossil close $ fossil open prj.fossil project-name: unnamed repository: /tmp/tmp_project/prj.fossil local-root: /tmp/tmp_project/ project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e server-code: 7efed910652f4fbceef4ec8cdcb152e7c944e7cc checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36 UTC parent: 259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13 18:42:54 UTC child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55 UTC tags: trunk comment: added a fdle (user: spiffy) $ ls file2 _FOSSIL_ new_file prj.fossil === file2 should not appear when I am viewing the trunk branch because it doesn't exist there- it only exists in the branch2 branch. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org mailto: fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Andreas Kupries Senior Tcl Developer ActiveState, The Dynamic Language Experts P: 778.786.1122 F: 778.786.1133 andre...@activestate.com http://www.activestate.com Get insights on Open Source and Dynamic Languages at www.activestate.com/blog ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ 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] Fossil not removing files when switching branches
That would be helpful. I got the idea to use 'close' from section 4.4.4 of the fossil book, which indicates branches should be checked out by using 'open'. I thought to myself, how could I open it if it is not first closed?, and thus my confusion was born. On Wed, Jul 13, 2011 at 3:45 PM, Richard Hipp d...@sqlite.org wrote: On Wed, Jul 13, 2011 at 3:33 PM, Brian Cottingham spiffyt...@gmail.comwrote: Should fossil close/open behave differently from fossil update? Is this a bug in Fossil, or is it deliberate? The behavior is deliberate. I'd understand what you are expecting from close. My recommendation is that you never use the close command. It really is not needed for anything. Maybe I should simply remove the close command to avoid confusion? 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 ___ 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] Can't make gdiff work
I installed openssl-devel and was able to successfully compile fossil in Cygwin with a simple make command, no Makefile modifications necessary. Would it be easy to add a check for openssl-devel to the build process to provide a more helpful error message than the compile error? On Tue, Jun 28, 2011 at 3:48 PM, Tomek Kott tkott.s...@gmail.com wrote: I think as long as you have the development versions of libssl installed on your cygwin, you should be set. I'll try to remember to try it at home myself, and report back. Tomek 2011/6/28 Lluís Batlle i Rossell virik...@gmail.com 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 specially build fossil on cygwin (there is no distributed cygwin binary on fossil-scm.org), in order to have terminal capabilities. I like the rxvt terminal vim to be launched on commit, and it only works with a cygwin-aware fossil. That is, fossil built on cygwin. It's trivial to build there. On Tue, Jun 28, 2011 at 8:34 AM, Brian Cottingham spiffyt...@gmail.com wrote: I'm using Fossil from a Cygwin terminal and I can't get the gdiff command to work with vimdiff. I've tried setting gdiff-command to vimdiff but running fossil gdiff I get 'vimdiff' is not recognized as an internal or external command. I tried setting the command to /usr/bin/vimdiff but I get The system cannot find the path specified. vimdiff is definitely in my $PATH. What am I doing wrong? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Can't make gdiff work
I'm using Fossil from a Cygwin terminal and I can't get the gdiff command to work with vimdiff. I've tried setting gdiff-command to vimdiff but running fossil gdiff I get 'vimdiff' is not recognized as an internal or external command. I tried setting the command to /usr/bin/vimdiff but I get The system cannot find the path specified. vimdiff is definitely in my $PATH. What am I doing wrong? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
