[fossil-users] copy configuration from repo to repo?
Hi, 1) I've just configured my first fossil repo and now would like to copy this configuration to other projects. Is it possible? Most problematic part is enabling assigned_to and opened_by in tickets as per this: http://fossil-scm.org/index.html/doc/trunk/www/custom_ticket.wiki . Why isn't it actually there out of the box? Or it is there and I just missed it? It is a bit painful to go through this process for all the project that I have... 2) Two ideas for future features (please tell me whether you will consider implementing them): a) alias for urls: possibility to provide an alias for url of each page so that it looks cleaner. For example for the page mentioned above alias could be custom_ticket, so that the url will look like: http://fossil-scm.org/custom_ticket b) a page with a simple contact form (optionaly with captcha and attachments) that will send the message to a predifined email according to topic selected by sender. Thank you, ST ___ 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] copy configuration from repo to repo?
On 03/20/2012 12:19 PM, ST wrote: Hi, 1) I've just configured my first fossil repo and now would like to copy this configuration to other projects. Is it possible? Hello - It is simple: do fossil help config for all the options, but you basically want fossil config export and fossil config import Most problematic part is enabling assigned_to and opened_by in tickets as per this: http://fossil-scm.org/index.html/doc/trunk/www/custom_ticket.wiki . Why isn't it actually there out of the box? Or it is there and I just missed it? It is a bit painful to go through this process for all the project that I have... It's not too bad, you can copy+paste from one config window to the other (in your browser) ___ 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] Thanks and some questions
To see the list of unmanaged files: Thank you. It is more manual than I was looking for but if that's the way it works that's the way it works. Beware of any program that thinks it knows more than you do. -- D. Richard Hipp Point taken, but that isn't what I've been wondering about and anyway isn't doing clerical tasks better than humans exactly the sort of thing software should do? In other words we're forgetful and make mistakes. I don't suggest automagically adding everything and anything but flagging them does seem prudent and helpful without going over the line and actually making a decision for us. Especially if the globbing exclude (perhaps you can do globbing includes as well) is set it seems safe to at least put out a prompt and we can answer all, none, yes or no to each in the list. Something like that *might* be good. fossil already alerts us when a file you said to manage isn't in the directory for change, stat, commit (maybe others, haven't come across it yet). Why isn't the converse done automagically? It's not symmetric right now. It seems reasonable change, stat, and commit would flag files in the managed directory tree that aren't managed. Is that helpful or does it become like the endless Windows OK prompts? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] merge strategy ours
Hi there, GIT has a useful merge strategy git merge -s ours that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge parents. How to achieve the same effect in fossil?? For those who wonder why do I need such a thing here is a use case. I tend to commit very often. In order to prevent polluting public branches I work mostly on private branches periodically merging the changes (when they are in good shape) into public branches. When merging private branch into a public one fossil does not record private branch as a merge parent (and for a good reason!). Often I do have a suitable merge parent candidate. How do I trick fossil into just adding a commit into manifest's P card to make it a merge parent?? --Leo-- ___ 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] Thanks and some questions
Depending on if your files fit a nice set of patterns you may want to consider using ignore-glob to keep from seeing your irrelevant files. The methodology I encourage on our team is that a fossil extras should always be clean, i.e. there should be no extras. That sounds like a good idea. Any extras should be either added to fossil with fossil add or added to the glob list. Good point. To make that a bit easier we use the .fossil-settings/ignore-glob file instead of the setting via the ui. Don't forget to fossil add the .fossil-settings/ignore-glob file. Thanks, I'll have a look at this. We commonly have one or more build directories where various processes are run and ignore them all with a */build/* pattern or similar. However do be careful with blanket ignores. If I recall correctly fossil behavior is a little odd when it comes to controlled files that match an ignore pattern. I seem to remember that a modified controlled file masked by a ignore does not show up in fossil status Thanks for the tips, this is the kind of advice I was hoping for :) ___ 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] merge strategy ours
The simplest way to let merge conflicts happen, and restore versions from an older commit if you know the file artifact ids: fossil artifact a59bd2322 my/file.txt On Tue, Mar 20, 2012 at 14:14, Leo Razoumov slonik...@gmail.com wrote: Hi there, GIT has a useful merge strategy git merge -s ours that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge parents. How to achieve the same effect in fossil?? For those who wonder why do I need such a thing here is a use case. I tend to commit very often. In order to prevent polluting public branches I work mostly on private branches periodically merging the changes (when they are in good shape) into public branches. When merging private branch into a public one fossil does not record private branch as a merge parent (and for a good reason!). Often I do have a suitable merge parent candidate. How do I trick fossil into just adding a commit into manifest's P card to make it a merge parent?? --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Benoit Mortgat 20, avenue Marcel Paul 69200 Vénissieux, France +33 6 17 15 41 58 +33 4 27 11 61 23 ___ 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] merge strategy ours
On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat mort...@gmail.com wrote: The simplest way to let merge conflicts happen, and restore versions from an older commit if you know the file artifact ids: fossil artifact a59bd2322 my/file.txt Why not just fossil revert my/file.txt? On Tue, Mar 20, 2012 at 14:14, Leo Razoumov slonik...@gmail.com wrote: Hi there, GIT has a useful merge strategy git merge -s ours that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge parents. How to achieve the same effect in fossil?? For those who wonder why do I need such a thing here is a use case. I tend to commit very often. In order to prevent polluting public branches I work mostly on private branches periodically merging the changes (when they are in good shape) into public branches. When merging private branch into a public one fossil does not record private branch as a merge parent (and for a good reason!). Often I do have a suitable merge parent candidate. How do I trick fossil into just adding a commit into manifest's P card to make it a merge parent?? --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Benoit Mortgat 20, avenue Marcel Paul 69200 Vénissieux, France +33 6 17 15 41 58 +33 4 27 11 61 23 ___ 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] strange 'login failed' error on initial repository clone.
I should have mentioned that as well. I get the same error either way. :) I started with that method and migrated to the http://user:pwd@... approach when I needed to double-check my password for correctness. On Tue, Mar 20, 2012 at 5:22 AM, Richard Hipp d...@sqlite.org wrote: On Tue, Mar 20, 2012 at 2:12 AM, Jeremy Anderson jere...@gmail.comwrote: Hey everyone. Need a little help... I don't have any good ideas of why this isn't working But just for grins, try entering just the username in the URL and let Fossil prompt you for the password. Maybe there is some bug in the MBCS-to-UTF conversion for passwords typed into URLs or something *Problem:* Attempting to clone a recently-created repository gives this error: D:\f\repofossil clone http://user:p...@ec2-xxx.compute.amazonaws.com:6969/hekated:\f\repo\hekate.fossil Bytes Cards Artifacts Deltas Sent: 53 1 0 0 Received: 341 5 1 0 Sent: 58 2 0 0 Error: login failedxe: Received: 52 1 0 0 Total network traffic: 667 bytes sent, 819 bytes received C:\Windows\fossil.exe: server returned an error - clone aborted (no, user is not the actual username, pwd is not the password, and xxx is not the real machine name) *What I did to set it up:* 1. I'm using Fossil version 1.22 [5dd5d39e7c] 2012-03-19 12:45:47 to set up a new Fossil server on Win2k8 R2 64-bit (hosted by Amazon's EC2 cloud service). 2. Used this to command create the service instance: *fossil winsrv create -S auto -P 6969 -R c:\repo * 1. (*c:\repo* holds our fossil repository file, hekate.fossil. The repository is currently empty (apart from the initial/default checkin). 3. I've created an admin+setup user for myself (user) and given him a password (pwd) i'm very familiar with. 4. Opened port 6969 for the machine in Amazon's EC2 configuration for this machine 5. Opened the Windows firewall for port 6969. *What I know works:* - The repository is visible via the web at the same url as above. - The same credentials (user:pwd) work just fine to log into the repository website. *What i've done to troubleshoot:* - Checked and re-checked the user/pwd combo - (Successfully) Logged in to the repository from the same machine (via the web) with the same credentials ** *Any thoughts on why I can't clone the repository?* Thanks! -jer ___ 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 ___ 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] merge strategy ours
Because I was confusing “ours” and “their”. On Tue, Mar 20, 2012 at 14:57, Richard Hipp d...@sqlite.org wrote: On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat mort...@gmail.com wrote: The simplest way to let merge conflicts happen, and restore versions from an older commit if you know the file artifact ids: fossil artifact a59bd2322 my/file.txt Why not just fossil revert my/file.txt? -- Benoit Mortgat ___ 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] bash: ./fossil: cannot execute binary file
If anyone needs a statically compiled x86_64 binary: -rwxr-xr-x 1 root root 1830728 Mar 20 11:05 /usr/bin/fsl It was compiled with GCC 4.6.2 and Musl. Compile options: https://github.com/tongson/Gimokod/blob/7296c5b381994a06b0a13bd6445833f13426910c/core/fsl/PKGBUILD ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] committing a folder structure without files?
I know Fossil is a *file* versioning system, but when first establishing a repository for a working group, it is useful to create a straw-man folder structure to guide growth. But, one can't (by default?) commit an empty folder to a fossil repository, as there's nothing to 'version'. For example, when developing games with UDK, they recommend a folder structure like this: ├───official_game_assets │ ├───alpha │ ├───beta │ │ ├───Binaries │ │ ├───Development │ │ ├───Engine │ │ │ ├───Config │ │ │ ├───Content │ │ │ │ ├───Functions │ │ │ │ └───Maps │ │ │ │ └───Template │ │ │ ├───Extras │ │ │ ├───Localization │ │ │ ├───Shaders │ │ │ └───Stats │ │ └───UDKGame │ │ ├───Autosaves │ │ ├───Build │ │ ├───Config │ │ ├───Content │ │ │ ├───Maps │ │ │ ├───Mobile │ │ │ ├───Private │ │ │ ├───Shared │ │ │ ├───Showcases │ │ │ └───TestPackages │ │ ├───Flash │ │ ├───Localization │ │ ├───Logs │ │ ├───Movies │ │ ├───Scripts │ │ └───Splash Is there a way around this? Can you commit an empty folder somehow? (I'd prefer to not have to go generate a placeholder readme.txt or .purpose file for each folder, just to get Fossil to recognize that it should exist... but I will if i must.) Just curious... -jer ___ 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] committing a folder structure without files?
On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson jere...@gmail.com wrote: I know Fossil is a file versioning system, but when first establishing a repository for a working group, it is useful to create a straw-man folder structure to guide growth. But, one can't (by default?) commit an empty folder to a fossil repository, as there's nothing to 'version'. For example, when developing games with UDK, they recommend a folder structure like this: ├───official_game_assets │ ├───alpha │ ├───beta │ │ ├───Binaries You can use the versionable setting “empty-dirs”. Create a file named .fossil-settings/empty-dirs in your checkout, and fill it with: /official_game_assets/alpha /official_game_assets/beta/Binaries ... Add that file to the fossil repository, this will maintain a versionable list of empty directories. -- Benoit Mortgat ___ 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] committing a folder structure without files?
On Tue, Mar 20, 2012 at 16:51, Benoit Mortgat mort...@gmail.com wrote: On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson jere...@gmail.com wrote: I know Fossil is a file versioning system, but when first establishing a repository for a working group, it is useful to create a straw-man folder structure to guide growth. But, one can't (by default?) commit an empty folder to a fossil repository, as there's nothing to 'version'. For example, when developing games with UDK, they recommend a folder structure like this: ├───official_game_assets │ ├───alpha │ ├───beta │ │ ├───Binaries You can use the versionable setting “empty-dirs”. Create a file named .fossil-settings/empty-dirs in your checkout, and fill it with: /official_game_assets/alpha /official_game_assets/beta/Binaries ... Add that file to the fossil repository, this will maintain a versionable list of empty directories. I've answered a bit fast. You actually need to declare all sublevels: /official_game_assets /official_game_assets/alpha /official_game_assets/beta /official_game_assets/beta/Binaries ... In order to create the dirs, just run “fossil update”. -- Benoit Mortgat ___ 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] committing a folder structure without files?
Sounds like a winning suggestion. Having issues with it though. specifying \developer\jer results in: c:\fossil\fossil.exe: couldn't create directory \developer\jer as required by empty-dirs setting specifying /developer/jer results in: c:\fossil\fossil.exe: couldn't create directory /developer/jer as required by empty-dirs setting specifying developer/jer results in: c:\fossil\fossil.exe: couldn't create directory developer/jer as required by empty-dirs setting Any ideas? On Tue, Mar 20, 2012 at 8:51 AM, Benoit Mortgat mort...@gmail.com wrote: On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson jere...@gmail.com wrote: I know Fossil is a file versioning system, but when first establishing a repository for a working group, it is useful to create a straw-man folder structure to guide growth. But, one can't (by default?) commit an empty folder to a fossil repository, as there's nothing to 'version'. For example, when developing games with UDK, they recommend a folder structure like this: ├───official_game_assets │ ├───alpha │ ├───beta │ │ ├───Binaries You can use the versionable setting “empty-dirs”. Create a file named .fossil-settings/empty-dirs in your checkout, and fill it with: /official_game_assets/alpha /official_game_assets/beta/Binaries ... Add that file to the fossil repository, this will maintain a versionable list of empty directories. -- Benoit Mortgat ___ 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] committing a folder structure without files?
Brilliant. that did it. Disregard my last. :) On Tue, Mar 20, 2012 at 8:54 AM, Benoit Mortgat mort...@gmail.com wrote: On Tue, Mar 20, 2012 at 16:51, Benoit Mortgat mort...@gmail.com wrote: On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson jere...@gmail.com wrote: I know Fossil is a file versioning system, but when first establishing a repository for a working group, it is useful to create a straw-man folder structure to guide growth. But, one can't (by default?) commit an empty folder to a fossil repository, as there's nothing to 'version'. For example, when developing games with UDK, they recommend a folder structure like this: ├───official_game_assets │ ├───alpha │ ├───beta │ │ ├───Binaries You can use the versionable setting “empty-dirs”. Create a file named .fossil-settings/empty-dirs in your checkout, and fill it with: /official_game_assets/alpha /official_game_assets/beta/Binaries ... Add that file to the fossil repository, this will maintain a versionable list of empty directories. I've answered a bit fast. You actually need to declare all sublevels: /official_game_assets /official_game_assets/alpha /official_game_assets/beta /official_game_assets/beta/Binaries ... In order to create the dirs, just run “fossil update”. -- Benoit Mortgat ___ 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] merge strategy ours
On Tue, Mar 20, 2012 at 09:57, Richard Hipp d...@sqlite.org wrote: Why not just fossil revert my/file.txt? For each one of dozens of files in the manifest?? I tried $ fossil revert and it reverts the contents of all files but at the same time it also removes merge record (clears vmerge table). All I want is to record a new merge parent without merging in file contents. --Leo-- On Tue, Mar 20, 2012 at 14:14, Leo Razoumov slonik...@gmail.com wrote: Hi there, GIT has a useful merge strategy git merge -s ours that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge parents. How to achieve the same effect in fossil?? For those who wonder why do I need such a thing here is a use case. I tend to commit very often. In order to prevent polluting public branches I work mostly on private branches periodically merging the changes (when they are in good shape) into public branches. When merging private branch into a public one fossil does not record private branch as a merge parent (and for a good reason!). Often I do have a suitable merge parent candidate. How do I trick fossil into just adding a commit into manifest's P card to make it a merge parent?? --Leo-- ___ 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] strange 'login failed' error on initial repository clone.
On Tue, Mar 20, 2012 at 10:11, Jeremy Anderson jere...@gmail.com wrote:
Thanks, Leo. You just solved my problem!
The password I was using began with a hash symbol ('#')... adding an
additional # (##[password]) got it to work.
Is it just me, or is putting special tokens like that in the password a bad
idea? :)
Jeremy,
I am glad that this little undocumented trick solved your problem. In
Fossil's login process leading # has a special meaning. If one runs
fossil as a CGI script and the web server requires its own basic
authorization (authentication) prepend an extra # to your password.
In general I would recommend to stay away from special chars like
*^#* in your password. If you are concerned with your password
security make your password longer. 64^8 is greater than 70^7.
--Leo--
On Tue, Mar 20, 2012 at 4:03 AM, Leo Razoumov slonik...@gmail.com wrote:
On Tue, Mar 20, 2012 at 02:12, Jeremy Anderson jere...@gmail.com wrote:
Hey everyone. Need a little help...
Problem:
Attempting to clone a recently-created repository gives this error:
D:\f\repofossil clone
http://user:p...@ec2-xxx.compute.amazonaws.com:6969/hekate
d:\f\repo\hekate.fossil
Could you, please try URL without password like this:
D:\f\repofossil clone
http://u...@ec2-xxx.compute.amazonaws.com:6969/hekate
d:\f\repo\hekate.fossil
Now when fossil prompts you for a password type # followed by your
password.
'#' prefix tells fossil to use the password (with # removed, of
course) both for your server Basic Authorization and for your fossil
repo.
Please, let the list know whether it helps.
--Leo--
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
