Re: [fossil-users] commits from host A sometimes not seen on B
Richard, Using fossil version 1.26 [c9cb6e7293] 2013-06-18 21:09:23 UTC. Command: fossil sync --verily Result: unknown repository: --verily Grepping the code I see the --verily option looks only applicable to the fossil scrub command. Is there a particular version that supports --verily for sync. Thanks, Clive On Sun, Aug 18, 2013 at 11:43 AM, Clive Hayward haywa...@chayward.comwrote: Richard, Would love to share repositories but would be violating my IP agreements:( So I'll need to try and trigger the problem with non-business data. Thanks for the reference to fossil sync --verily On Sun, Aug 18, 2013 at 11:36 AM, Richard Hipp d...@sqlite.org wrote: I think there is a bug in the sync algorithm that sometimes causes it to quit before both sides are fully synced up. But I don't yet have a reproducible test case, so it is a hard problem to fix. If you find a pair of repositories that are not fully syncing, please do this: (1) Make backup copies of the repositories on both sides of the exchange and make them available to me for debugging. (2) Run fossil sync --verily which is a heavy-duty sync that has a simpler design that uses more bandwidth but which is also much more likely to run to completion. A single fossil sync --verily is probably sufficient to get the two repos talking again after which ordinary syncs (without the --verily option) should be sufficient again. -- D. Richard Hipp d...@sqlite.org -- Clive Hayward -- Clive Hayward ___ 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] commits from host A sometimes not seen on B
I have experienced a similar problem as Steve on several occasions. To fix the problem I've been rebuilding the server repository and then merging on the server. Then the clients can pull to get in sync. Clive On Sun, Aug 18, 2013 at 9:25 AM, Stestagg stest...@gmail.com wrote: We had a similar situation last week: Fossil server hosting many repos, two active clients on one repo. Clients A and B were both working on the same branch simultaneously. Client A commits (commit 1) Client B tries to commit, gets conflict warning. Client B runs fossil update Client B commits successfully Timeline on server shows two leaves with the same tag. Client B never sees commit 1.. Running any combination of pull update rebuild does not work. The commit message for 1 is not present in the database. In the end, I resolved this by re-cloning from the server. Note we've been doing parallel commits on the branch for a while. And this has only happened once, both clients use auto sync. I was going to chalk this up to cosmic particles or similar, but it sounds as of it might be related. Thanks Steve On 18 Aug 2013 16:51, Michai Ramakers m.ramak...@gmail.com wrote: On 18 August 2013 17:43, Stephan Beal sgb...@googlemail.com wrote: On Sun, Aug 18, 2013 at 5:20 PM, Michai Ramakers m.ramak...@gmail.com wrote: 1) on host S: clone project from host S (http://S/my_repo) 2) on host C: clone project from host S (http://S/my_repo) 3) on host C: do some work, and commit changes 4) on host S, 'fossil up' 5) on host S: 'fossil timeline' doesn't show the recent commit 6) on host S: 'fossil pull' doesn't show the commit either in 'fossil timeline' 7) on host C: do more work, and commit changes 8) on host 'S': 'fossil up'; now all recent commits are seen It sounds almost like you have autosync turned off - do 'up' and 'pull' show any network traffic? Tbh I forgot - the error-situation is gone now, sadly. Related question: I typically use 'fossil up', and never 'fossil sync' (or pull/push) in my workflow, working on 2 hosts on the same project - should I? That doesn't sound wrong. If autosync is on there is rarely a need for push/pull. Do an 'up' when you start working, to make sure you aren't working from what would become a fork, and it will sync/push when you commit (if autosync is on). Right. If it comes up again, I'll try to keep it as-is, if that's possible, and post it on here - who knows. Michai ___ 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 -- Clive Hayward ___ 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] commits from host A sometimes not seen on B
Michai, In more than one instance a subsequent commit was performed on one of the clients (unaware that there was an issue). That commit was visible to the other client only after the server repository was rebuilt. Clive On Sun, Aug 18, 2013 at 10:28 AM, Michai Ramakers m.ramak...@gmail.comwrote: did any of you (Steve/Clive) by any chance try committing once more (a dummy-change or similar) on what Steve has named client A (the client whose commit is never seen by the other host)? (And if so, did both it and the missing commit show up?) Michai ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Clive Hayward ___ 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] commits from host A sometimes not seen on B
Stephan, Although I haven't been able to consistently reproduce the errors. These were definitely not network errors. The steps involve. 1) Client A makes a commit. 2) Client B makes a commit - but is warned that they will fork. 3) Client B updates - but doesn't appear to get Client A's commit. 4) Client B commits with no error and the server forks. 5) Client C updates but only gets Client A or B's commit but not both. At this point fossil rebuild on the server. Clients can update and can see the other leafs. On Sun, Aug 18, 2013 at 10:58 AM, Stephan Beal sgb...@googlemail.comwrote: On Sun, Aug 18, 2013 at 7:35 PM, Clive Hayward haywa...@chayward.comwrote: Michai, In more than one instance a subsequent commit was performed on one of the clients (unaware that there was an issue). That commit was visible to the other client only after the server repository was rebuilt. i've had a couple cases which sound similar but were explainable. i would make a commit, the push would fail because my network was out or whatever, and i wouldn't notice it. Later on i'd wonder where my commit was. That's happened to me a handful of times over the years. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal -- Clive Hayward ___ 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-users@lists.fossil-scm.org
It looks like your command line c compiler is not configured as expected. Did you install the command line Xcode? See http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools On one of my machines I have no difficulty building fossil from sources. which cc /usr/bin/cc cc --version i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.1.00) Copyright (C) 2007 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. On Mon, Mar 25, 2013 at 10:29 AM, Stephen De Gabrielle spdegabrie...@gmail.com wrote: Hi, anyone had trouble compiling fossil on osx? I've not done it for a while and I'm wondering If I've missed something important? cheers, Stephen sp-laptop:fossil spdegabrielle$ ./configure Host System...x86_64-apple-darwin12.3.0 Build System...x86_64-apple-darwin12.3.0 C compiler... cc -g -O2 C++ compiler... c++ -g -O2 Build C compiler...cc Checking for stdlib.h...not found Error: Compiler does not work. See config.log Try: 'configure --help' for options sp-laptop:fossil spdegabrielle$ xcrun -find gcc /Applications/Xcode.app/Contents/Developer/usr/bin/gcc sp-laptop:fossil spdegabrielle$ cat configure #!/bin/sh dir=`dirname $0`/autosetup WRAPPER=$0 exec `$dir/find-tclsh` $dir/autosetup $@ sp-laptop:fossil spdegabrielle$ open . -- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Clive Hayward ___ 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 version 1.25 scheduled.
Please add the latest Microsoft Office formats to the supported types. .xlsx, docx, pptx Thanks On Sat, Dec 1, 2012 at 5:35 AM, Richard Hipp d...@sqlite.org wrote: On Sat, Dec 1, 2012 at 4:03 AM, Richard Hipp d...@sqlite.org wrote: I wonder if it should be even more restrictive - and only deliver static content that ends in some well-known subset of suffices: *.html, *.htm, *.jpg, *.jpeg, *.gif, *,png, *.txt, *.css, *.js I think this would be too restrictive. I changed it so that it will only serve files with one of the 187 different suffixes for which Fossil is able to guess the mimetype. (See http://www.fossil-scm.org/fossil/artifact/734e4bf7a6ffc5?ln=97-283) None of *.fossil, *.fossil-journal, *.fossil-wal, and *.fossil-shm are on that list. -- Clive Hayward ___ 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 design error and possible ways to fix it
In my workflow each commit is associated with a ticket. This provides me with requirement tracking and traceability from the requirements/tasks/defects stored in tickets to the code or data changes in the repository. So like Ross I would like the functionality using the [hashcode] to be maintained. I would actually like a warning if [hashcode] link doesn't exist. On Mon, Nov 26, 2012 at 11:31 AM, Ross Berteig r...@cheshireeng.com wrote: On 11/22/2012 5:05 AM, Richard Hipp wrote: Fossil understands check-in comments and ticket text to be Wiki/HTML. Let's say that the mimetype is text/x-fossil-wiki. This approach worked well for us on CVSTrac (which was where many of the ideas in Fossil originated) because it allowed hyperlinks to other check-ins, tickets, wiki, etc to be embedded in the check-in comment text. For commit messages, I frequently use a message like See ticket [deadbeef] when the checkin is directly related to a ticket. Personally, I don't think I've ever wanted to use [] in a commit message for anything else. But then, I try hard to use tickets to hold the larger issue discussions and keep commit messages short and to the point. Since the wiki render also displays the links to closed tickets distinctly, this works out nicely. Changing commit messages to a pure text/plain interpretation would break that usage. Unless you consider a ticket or checkin uuid in brackets to also be a valid URL, if the referenced artifact exists. That would have the benefit of providing some visual feedback for mis-typed artifact names by not making those be links. That said, I do support the idea that the commit comment get a very light handed markup treatment. It fits my personal workflow well if the commit comments are expected to be short and largely free of markup. -- Ross Berteig r...@cheshireeng.com Cheshire Engineering Corp. http://www.CheshireEng.com/ -- Clive Hayward ___ 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] how to insert a into a file when check-in (or check-out) i don't care
Turn on fossil manifest setting: fossil settings manifest on A file called manifest.uuid containing your revision hash code is generated at the root of your checkout. You can then write a simple text processing script to embed the manifest.uuid file into your delivered file. On Fri, Nov 16, 2012 at 3:00 PM, rc2...@orange.fr wrote: Hello all, After read the doc,web and searching this list,i'm asking you: i'm keeping config files for network equipments (F5 BigIP) with fossil; when i distribute one file to someone, i want it to contain the revision number embedded in comment for example. like that # rev: $$ # etc ... after check-in, fossil would insert the rev between the 2 dollar signs and i would get: # rev: $ab43$ # etc ... Or, i doubt that the fossil developer inserts manually the rev number inside the source code for displaying the following text: [C:\temp]fos version This is fossil version 1.21 [002580c50d] 2011-12-13 13:53:56 UTC Thank you JM Marchi -- rc2...@orange.fr -- Clive Hayward ___ 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] Timeline item presentation
1) This is interrupted as a hyperlink. Commit messages use the same formatting rules as the wiki pages. See Hyperlinks at: http://www.fossil-scm.org/xfer/wiki_rules. It is useful to reference a particular repository artifact with the commit. Particularly useful in binding ticket reports to commits. 2) I don't believe there is a way to turn off this functionality. If you need to use '[' and ']' without interruption you can use #91; and #93; On Mon, Nov 5, 2012 at 4:03 PM, K k...@lightpowered.org wrote: I've just noticed that a commit message containing [ ] is presented in the web interface as underlined. I presume this is some kind of mark-up I stumbled into. 1. What is this? 2. How can I cause this to not happen? I'd prefer if timeline items were left 'plain text'. Thank you, ^K ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Clive Hayward ___ 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] Building a new repository with the same users and passwords as an existing repository.
Is there a way to turn on group login from the command line? Thanks Clive On Tue, Sep 11, 2012 at 6:05 PM, Clive Hayward haywa...@chayward.com wrote: On Tue, Sep 11, 2012 at 5:43 PM, Richard Hipp d...@sqlite.org wrote: On Tue, Sep 11, 2012 at 7:25 PM, Clive Hayward haywa...@chayward.com wrote: With fossil version 1.23 [957b17af58], I am serving multiple repositories using the directory-of-repository feature outlined by drh in http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg01486.html I wish to create new repositories using the same usernames, passwords and permissions as a master repository. I can create a new repository and have web access with the same repository by turning on the group-login feature but this doesn't add the users so they cannot clone a repository. If I export then import the users configuration from the master repository to the new repository. The users exist but the passwords need to be updated via the web-interface before they can clone the repository. If you export/import the users, then set group-login, you should be able to login to the new repo using the password on the old one. Is that not working for you? I am able to login in to the web site no problem. But cannot clone the repository. Here is the result of a clone command on a new repository with login group turned on and user configuration imported: Bytes Cards Artifacts Deltas Sent: 53 1 0 0 Received: 152 3 0 0 Sent: 68 2 0 0 Error: login failed Received: 52 1 0 0 Sent: 43 0 0 0 Error: login failed Received: 52 1 0 0 Total network traffic: 956 bytes sent, 991 bytes received fossil: server returned an error - clone aborted Unfortunately, the password hash used by Fossil includes the project code, so different repositories have different hashes even if the actual password text is the same. (This is a security feature.) How can I copy the configuration users and passwords and membership in group-login from an existing repository? Also, shouldn't the group-login information be part of the configuration export or accessible from the settings on the command line? I don't think group-login should be part of configuration export/import. Configuration export/import is used to move configurations from one installation to another. But at each installation, you (or at least I) typically have a different set of repos and so the group-login information no longer makes sense. Regards, Clive Hayward ___ 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 Thanks -- Clive Hayward -- Clive Hayward ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Building a new repository with the same users and passwords as an existing repository.
With fossil version 1.23 [957b17af58], I am serving multiple repositories using the directory-of-repository feature outlined by drh in http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg01486.html I wish to create new repositories using the same usernames, passwords and permissions as a master repository. I can create a new repository and have web access with the same repository by turning on the group-login feature but this doesn't add the users so they cannot clone a repository. If I export then import the users configuration from the master repository to the new repository. The users exist but the passwords need to be updated via the web-interface before they can clone the repository. How can I copy the configuration users and passwords and membership in group-login from an existing repository? Also, shouldn't the group-login information be part of the configuration export or accessible from the settings on the command line? Regards, Clive Hayward ___ 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] Building a new repository with the same users and passwords as an existing repository.
On Tue, Sep 11, 2012 at 5:43 PM, Richard Hipp d...@sqlite.org wrote: On Tue, Sep 11, 2012 at 7:25 PM, Clive Hayward haywa...@chayward.com wrote: With fossil version 1.23 [957b17af58], I am serving multiple repositories using the directory-of-repository feature outlined by drh in http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg01486.html I wish to create new repositories using the same usernames, passwords and permissions as a master repository. I can create a new repository and have web access with the same repository by turning on the group-login feature but this doesn't add the users so they cannot clone a repository. If I export then import the users configuration from the master repository to the new repository. The users exist but the passwords need to be updated via the web-interface before they can clone the repository. If you export/import the users, then set group-login, you should be able to login to the new repo using the password on the old one. Is that not working for you? I am able to login in to the web site no problem. But cannot clone the repository. Here is the result of a clone command on a new repository with login group turned on and user configuration imported: Bytes Cards Artifacts Deltas Sent: 53 1 0 0 Received: 152 3 0 0 Sent: 68 2 0 0 Error: login failed Received: 52 1 0 0 Sent: 43 0 0 0 Error: login failed Received: 52 1 0 0 Total network traffic: 956 bytes sent, 991 bytes received fossil: server returned an error - clone aborted Unfortunately, the password hash used by Fossil includes the project code, so different repositories have different hashes even if the actual password text is the same. (This is a security feature.) How can I copy the configuration users and passwords and membership in group-login from an existing repository? Also, shouldn't the group-login information be part of the configuration export or accessible from the settings on the command line? I don't think group-login should be part of configuration export/import. Configuration export/import is used to move configurations from one installation to another. But at each installation, you (or at least I) typically have a different set of repos and so the group-login information no longer makes sense. Regards, Clive Hayward ___ 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 Thanks -- Clive Hayward ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
