Re: [fossil-users] Using fossil before importing from svn
On Tue, Sep 28, 2010 at 04:14:01PM -0400, Richard Hipp wrote: 2010/9/28 Lluís Batlle i Rossell virik...@gmail.com Hello, we are going to try to switch from svn into fossil. As we could not find any tool ready to import svn history (even a single branch) into fossil, I think that we are going to keep the svn history in its svn repository, and we will start fossil from a last agreed point in the svn history. Do you think that we will be able, at a later time, to add the 'past' history into our fossil repository, once someone writes a tool to import from svn? Using some kind of deconstruct/reconstruct, with the needed modifications and checksums and hash recalculations. That would work. To make an import tool for pre-history should really be no more difficult than making a generic import tool. That is what I thought. Except for one problem: When you start your new Fossil repository, you'll have an initial version, call is A. When you later import the pre-history from SVN, version A will not be linked to its parent in SVN. In other words, there will be a gap between the last SVN version and the first Fossil version. But I'm thinking that will be just a minor hiccup. And it is within the realm of possibility that we could enhance Fossil to allow you to fix that gap; the Fossil file format would support such a thing - it has just not been implemented yet. I think maybe someone will come up with a way to overcome that. Great. Then I don't mind waiting for a proper import tool or whatever fossil functionality, and I better start using fossil as soon as possible. Thank you, 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] WebDAV access
Hello, I am already using fossil instead of svn, but I cannot silent about asking a svn feature I enjoy a lot. I like the WebDAV service, when using svn through an apache module. It is not that I use its delta-v implementation much with autoversioning, but a simple readonly WebDAV access helps a lot looking at code in public svn servers. I use the fuse 'wdfs' to access svn repositories in internet, and also at our own servers just to check contents in some specific versions. I imagine it can be quite easy in fossil, as it has a web server, to implement read-only WebDAV access to a given commit manifest. It may not be that different from the 'Files' web view. What do you think? And having auto-versioning in delta-v would be a superb plus! :) ___ 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 remembering passwords
Hello, on linux, fossil does not remember the remote passwords for my push/pull commands. Nevertheless, I built fossil on cygwin, and it asks me the password only at the time of clone, and then all push/pull operations go for granted. Can anyone tell me where is fossil saving the password, how, and how can I disable/enable this? By the way, I had to build fossil on cygwin in order to use properly the cygwin 'vim', which did not cope well with a non-cygwin fossil at the time of editing the commit comments. 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] In a script, knowing about changes
Hello, migrating our tools from subversion, we need something that would give the functionality we got through 'svnversion'. It could indicate what version the current checked out tree was, and if it had changes over the repository or not. Can we get that directly by fossil, or we have to parse 'fossil status'? Thank you, 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] In a script, knowing about changes
On Fri, Oct 01, 2010 at 07:05:29AM -0400, Joshua Paine wrote: Seems like you'd need to parse `fossil status`, but it should be quite straightforward to do. Also note that the mixed version scenario that SVN support/inflicts isn't really a possibility in fossil, so you just need the line that looks like: checkout: d2faac0b1aa953d6e29ec188eb8d7f897351fca4 2010-09-30 19:52:05 UTC And then you could check if there were any lines beginning with capital letters, or you could just make an additional call to `fossil changes` and see if there's any output at all. Ok, this is how I already proceed. It was a bit tricky to get the same working on Windows and Linux, but I managed to, finally. Thank you, 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] Repeating branch names
Hello, I have not tried, but what should I expect if I try to use a new branch naming it as a branch already closed? Is it something I will not be able to do, or something I should try to avoid? And a bit unrelated, the branch comes determined from the 'branch' tag, and not from the sym-branchname, right? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Elipsis in filenames
Hello, I was using a poor script I wrote to move from svn to fossil, and I was getting the deleted files through the MISSING lines of 'fossil changes'. But I hit a long filename that fossil shortened using elipsis before the extension. The output I got was: MISSINGdoc/Induction/Camera design for machine vpdf That makes the fossil output 'hard to parse'; is this a feature? If so, how can I get the detailed list of files MISSING ? 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] Code review and branch per issue
On Mon, Oct 04, 2010 at 10:55:02PM +0200, Laurens Van Houtven wrote: Hello, I'm trying to migrate a Trac workflow to Fossil. Here's what it looks like: For each feature: 1. create ticket 2. create branch 3. implement 4. submit branch for review 5. review: if not good, back to 3 6. merge branch to trunk (trunk gets handed off to continuous integration/deployment system) It feels kind of unwieldy. I'm trying to figure out if that's because I'm not used to Fossil, or because I'm trying to make a cat bark. Is Fossil not built to work this way? It could be a misunderstanding, but I saw something about Fossil's autosync feature being all about preventing lots of needless branching. What is workflow supposed to look like instead? You can review against the trunk version it was updated from. As any DVCS, fossil does not provide methods to guarantee that noone commited over the same parent as you, so if that happens, you then will have to merge two heads of a single branch. This is inherent in DVCS, and not related to your review process. Is there a decent way of filtering tickets on the ones which are up for review and which ones aren't? In trac, I did this with tags; but fossil doesn't appear to have tags for tickets. You can write your own queries for fossil, and your own fields in each ticket. In the web Admin - Ticket configuration you can find that. Also what do you people use for code review? I can imagine using fossil diff for this, I guess. Ideas welcome. I still have not moved our scripts from svn to fossil, but what we used to do was prepare two checkout directories, one with the last trunk version merged in, and the other with the branch to review. Then we used meld (meld.sf.net) to get a diff while being able to edit the files. Then we leave comments and commit in the branch with the review results. I wonder how difficult it will be in fossil to find the version of the parent branch last merged into a child branch. 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] Elipsis in filenames
On Tue, Oct 05, 2010 at 12:01:06AM -0400, Richard Hipp wrote: 2010/10/4 Lluís Batlle i Rossell virik...@gmail.com Hello, I was using a poor script I wrote to move from svn to fossil, and I was getting the deleted files through the MISSING lines of 'fossil changes'. But I hit a long filename that fossil shortened using elipsis before the extension. The output I got was: MISSINGdoc/Induction/Camera design for machine vpdf That makes the fossil output 'hard to parse'; is this a feature? If so, how can I get the detailed list of files MISSING ? I don't think it is Fossil that is doing this. Are you sure you didn't add the file using the ellipsis? Run fossil ui and go to the head of trunk, then click on the manifest link. Does it show the full filename there, or does it contain the ellipsis? Ouch, it has the ellipsis, right. Sorry for the noise. ___ 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] Using fossil before importing from svn
On Tue, Sep 28, 2010 at 04:14:01PM -0400, Richard Hipp wrote: 2010/9/28 Lluís Batlle i Rossell virik...@gmail.com Hello, we are going to try to switch from svn into fossil. As we could not find any tool ready to import svn history (even a single branch) into fossil, I think that we are going to keep the svn history in its svn repository, and we will start fossil from a last agreed point in the svn history. Do you think that we will be able, at a later time, to add the 'past' history into our fossil repository, once someone writes a tool to import from svn? Using some kind of deconstruct/reconstruct, with the needed modifications and checksums and hash recalculations. That would work. To make an import tool for pre-history should really be no more difficult than making a generic import tool. Except for one problem: When you start your new Fossil repository, you'll have an initial version, call is A. When you later import the pre-history from SVN, version A will not be linked to its parent in SVN. In other words, there will be a gap between the last SVN version and the first Fossil version. But I'm thinking that will be just a minor hiccup. And it is within the realm of possibility that we could enhance Fossil to allow you to fix that gap; the Fossil file format would support such a thing - it has just not been implemented yet. I'm just trying that, and I've seen a big problem is the date of the initial commit, where I want to start putting the old commits from. The initial commit is quite recent while the svn commits are older. Any suggestion? ___ 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] Patch file in windows
On Wed, Oct 06, 2010 at 12:39:15PM +0200, Emil Totev wrote: Hello This is fossil version [b48f78964e] 2010-09-18 15:51:43 UTC on Windows XP SP3 When I create a patch file using fossil diff patch.txt the resulting file cannot be used for patching. It seems there is an extra 0D line separator (0d 0d 0a) for the actual source lines. (---, +++, @@ lines are OK). The source files have normal Windows line endings, 0d 0a. I saw the same annoyance in fossil built for cygwin. I use fossil diff | tr -d '\r' to overcome that. You may also want to set a gdiff-tool, and use 'fossil gdiff', if you have GNU diffutils available for example. I use that to get diffs in unified format. 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] Merging with a wrong system clock
Hello, we had a computer with a clock problem (its clock showed the time as two hours less, in the same timezone). At some point the 'trunk' last checkin was newer than 'branch' checkin, and the user run in 'branch': fossil merge trunk That ended up with all the changes from trunk ported, but the manifest was noted as a *single parent*, as if no merge happened. Of course the commit for this merge had a time *sooner* than the 'trunk' checkin it was merging from. Although these are a problematic conditions, shouldn't fossil have noted the merge properly? I just wonder if this behaviour is by chance or by design. 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] What I used to migrate my svn trunk branch into fossil
Hello, some here said that they want a tool to migrate the repository data from svn to fossil. I wrote some very poor scripts that did the job for me; being as simple as they are, they are not very generic but they may be easier to adapt than a 300 lines script. The manual procedure I did: - Get a checkout of trunk: svn co REPO/trunk - There get a list of the revisions of trunk from oldest to newest: svn log ^/trunk | grep '^r[0-9]' | sed 's/r\([0-9]\+\).*/\1/' | tac ../revs-trunk - Look at the date of the older revision, and create a new fossil repository: fossil new --date-override DATE_OLDER_THAN_OLDEST_SVN_COMMIT ../repo.fossil - Try to update to the oldest revision: svn update -r OLDEST - Open fossil fossil open ../repo.fossil - Call the import script I attach: sh PATH/import If any bad happens in the middle, note the revision where it failed, edit the ../revs-trunk so it starts back at that revision on the next 'import' run, and fix whatever will make the 'import' script keep on working. This may be of little use, but I better send it to the list instead of keeping it in hiding. Regards, Lluís. #!/bin/sh set -e set -x for a in `cat ../revs-trunk`; do MESSAGE=snv r$a `svn log -r $a | head -n -1 | tail -n +3` svn update -r $a SUSER=`svn info | grep Last Changed Author | sed 's/.*: \([^ ]\+\).*/\1/' ` SDATE=`svn info | grep Last Changed Date | sed 's/.*: \(.\+\) +.*/\1/' ` fossil add * fossil changes | grep MISSING | sed s/MISSING// | xargs -d '\n' fossil delete # It may fail if no changes found, like changing properties fossil commit -m $MESSAGE --date-override $SDATE --user-override $SUSER || true done ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Listing opened branch names
Hello, why listing branches (fossil branch list) or leaves (fossil leaves) returns a list of checkins, instead of a list of branch names? I don't know how to deduce from the tags list of those checkins shown in the result. Am I missing an obvious command to list the branch names? ___ 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] User Accounts: Syncing and Transferring
On Sun, Oct 10, 2010 at 10:28:14PM -0500, Andrew Moore wrote: Hello Everyone! Is it possible to transfer user accounts? If so, how? Hello, I noticed that All user accounts will be transfered if you clone (I don't know if pull) using the remote admin account (by http). 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] Troubles looking at changes of a file
Hello, I use the ui to know the changes of a file at a specified checkin. I go to Files (check-in f723beb5ff, trunk), and I click the file. It shows: Artifact bda684a9f7ea37be2137540b4b856df924d5f8ea Then it comes with a list of checkins affecting the file. It says, in the order said in the web page: part of checkin [346fbec0f8] (not trunk) - a branch never merged into trunk also part of check-in [1321136dd5] (trunk) - a branch merge into trunk also part of check-in [45289a198b] (not trunk) - a branch that was merged into trunk also part of check-in [391d0b2758] (not trunk) - a branch that was merged into trunk For me this kind of history looks very strange. Specially the first item. And why for the 2nd item it shows the 'merge' checkin and not the in-branch ckeckin introducing the change like the two last items? The last is the newer in time. If I click that checkin, and then in the list of modifications I click the concerning files, I get a history of that file. That history shows any change to the file at any branch, not caring on ancestors. This makes me think maybe this behaviour is a bug, or I am understanding things bad. How can I get the history of the file considering ancestors *on trunk*? ___ 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] Troubles looking at changes of a file
On Mon, Oct 11, 2010 at 11:19:39AM -0400, Richard Hipp wrote: 2010/10/11 Lluís Batlle i Rossell virik...@gmail.com Hello, I use the ui to know the changes of a file at a specified checkin. I go to Files (check-in f723beb5ff, trunk), and I click the file. It shows: Artifact bda684a9f7ea37be2137540b4b856df924d5f8ea Then it comes with a list of checkins affecting the file. It says, in the order said in the web page: part of checkin [346fbec0f8] (not trunk) - a branch never merged into trunk also part of check-in [1321136dd5] (trunk) - a branch merge into trunk also part of check-in [45289a198b] (not trunk) - a branch that was merged into trunk also part of check-in [391d0b2758] (not trunk) - a branch that was merged into trunk For me this kind of history looks very strange. Specially the first item. And why for the 2nd item it shows the 'merge' checkin and not the in-branch ckeckin introducing the change like the two last items? Is the following an example of what concerns you: http://www.fossil-scm.org/fossil/artifact/3680b8d4c4cc8fbeb50c94311d4afe20d53f8b45 I think the description of this file is correct. The description shows every check-in where the file is in the check-in but where the file is not in the parent check-in. That seems to me to be a pretty good description of how the file is used. What were you expecting it to do? Ah, I expected that to be a description of the checkins that *contributed* to those contents of the file. So, I understand it lists the open 'leaves' containing that file. Am I right? Sorry for the confusion. I was looking for a history of the file (regarding ancestors). I continue below... The last is the newer in time. If I click that checkin, and then in the list of modifications I click the concerning files, I get a history of that file. That history shows any change to the file at any branch, not caring on ancestors. This makes me think maybe this behaviour is a bug, or I am understanding things bad. How can I get the history of the file considering ancestors *on trunk*? So, to use the fossil-scm repository, I can go to Files, the Makefile, click the top trunk check-in: http://www.fossil-scm.org/fossil/info/68fa646f49 There, if I want the history of Makefile, I click in the modifications 'Makefile': http://www.fossil-scm.org/fossil/finfo?name=Makefile But that shows a list of ckeckins by date without considering ancestry since 68fa646f49. Now there is no way of getting a history considering only the ancestry, so I have to look at the arrows and follow the ancestry myself. Am I right? Thank you very much, 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] lynx as web browser
On Thu, Oct 14, 2010 at 03:06:28PM -0400, saulgo...@flashingtwelve.brickfilms.com wrote: Quoting Lluís Batlle i Rossell virik...@gmail.com: I'm trying: fossil settings web-browser lynx fossil ui rep.fossil and fossil settings web-browser `which lynx` fossil ui rep.fossil None of them open lynx as the web browser. What am I doing wrong? You (apparently) have to be within an open checkout to change the 'settings'. However, when you specify a repository to the 'ui' command, it employs the global setting for the web browser. Therefore you should use the '-global' switch when you change your 'settings'. fossil settings web-browser lynx -global fossil ui rep.fossil I was not in an open checkout. In that computer I never opened the repository, because I am only interested in the 'ui'. I have the global setting to 'lynx'. Out of any opened repository: $ fossil settings web-browser (global) lynx $ fossil ui file.fossil ^this does not open lynx. This opens firefox. Tested in x86_64-linux and mips-linux. If I get into an opened checkout, and I type fossil ui, it yes opens lynx. There may be some bug. May I report it or the list is enough? 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] Merging multi-level-branches
On Sun, Oct 17, 2010 at 12:18:20PM -0400, Richard Hipp wrote: On Sun, Oct 17, 2010 at 4:06 AM, Wolfgang rat...@stumvolls.de wrote: Hello I don't know, if the following behaviour is a feature, a bug or if this solution would be a feature request. I like to work with branches. Asuming: 1. i have a trunk development, using version 1, 2, 3 2. i started a branch name b1 at 1 and committed some changes 1.1.1, 1.1.2, 1.1.3 3. i started a second branch named b2 on the branch 1 at 1.1.2 using versions 1.1.2.1.1, 1.1.2.1.2 The above version numbers are given in CVS notation. If i decide to merge branch 2 to main trunk, i would expect, that merge b2 apllies patches 1.1.2.1.1, 1.1.2.1.2. But fossil merges the complete patch sequence starting from 1.1.1 to 1.1.2.1.2 to my trunk version 3. Fossil reads the commandline argument b2 and searches for the newest version with this tag and apllies all patches from the common base 1.1 until the found branch version. My expactation: Only diffs occuring on the branch should be apllied. I see only one chance: Applying all patches from the branch p2 using --cherrypick. Is this intended? The behavior is as intended. I like this behaviour intended. I just had the case of having a branch from trunk, and it had some changes I wanted to merge in to trunk, but I did not want all of them. So I can create a subbranch of 'branch', prepare it as I want it merged into trunk, and from trunk I can do: fossil merge subbranch But I wonder if a later merge in trunk like this will work fine: fossil merge branch 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] checkins related to XXX
Hello, I could not find the definition of what the ui shows as checkins related to ***, like when clicking on a branch through the Branches web menu. Can someone give one? Thank you, 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] backout a merge
On Mon, Nov 08, 2010 at 11:05:14AM -0800, Jeff Rogers wrote: Hi all, After you merge in changes from a different branch, but before you check in the merge, is there any way to back out the merge? fossil revert undoes the changes but leaves the files edited, although with no changes. You can use fossil checkout to make the files match a given commit. Alternately, is there a way to preview what a merge will do without actually doing the merge? After 'merge', nothing gets committed, so you can review the results in your working directory. But I'm using something like this for reviews previous to the merge: $ fossil test-find-pivot branch-to-merge branch-to-be-merged-to (it returns a commit id) Then you can do: $ fossil diff (commit id above) branch-to-merge to get a diff of the differences. I imagine this is what will be merged, and that's why I review this. It may not be what will be merged for some complex branch merges where the branches are not direct relatives, or there have been cherry-picked commits, because fossil somehow knows the merge history. Maybe Richard can point to some place giving information on how fossil knows the merge history, to understand what exactly it knows and how does it deal with that information. 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] Know when some files have been modified
On Fri, Nov 19, 2010 at 10:17:54AM -0500, Richard Hipp wrote: 2010/11/19 Lluís Batlle i Rossell virik...@gmail.com On Fri, Nov 19, 2010 at 10:03:48AM -0500, Richard Hipp wrote: 2010/11/19 Lluís Batlle i Rossell virik...@gmail.com Hello, is there any way I can know the history of a file, You mean like this? http://www.fossil-scm.org/fossil/finfo?name=Makefile Exactly! Is there any way it can show only the changes previous to a given checkin? (and only ancestors, without whatever could have been done with that file in branches apart). Are you looking for an annotated file change history (the thing that Git calls blame)? Click on the annotate link in the file history. Example: http://www.fossil-scm.org/fossil/annotate?checkin=42a964c585fe40ccfilename=Makefile I know annotate... in fact until the answers in the list telling about 'finfo', I've been using annotate to know when a file changed. I was expecting a way to get the list of versions where I would have to test, if I want to do a dichotomic search between a 'working version' and a 'not working version', both in the same branch. So, the problem I'm facing now is that I have a module in a subdirectory, and I think that the module is failing. That module has been changed in branches, merged to trunk, some branches did not get merged... and I find it very hard to know where that module (a subdirectory full of files, any of them could have the error) has been changed, for let's say, 'trunk'. Do you have an idea of how I would have to do that kind of search? 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] fossil: bad object id: 0
Hello, I've been using from some time fossil built for cygwin [12a79e5b93]. And on fossil update it says only this: fossil: bad object id: 0 fossil rebuild does not help. We use a central repository in linux 32-bit also running that version, but some clients use older and newer fossil versions (all after 2010-09-01). Any idea? 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] fossil: bad object id: 0
On Tue, Nov 23, 2010 at 09:57:23AM +0100, Lluís Batlle i Rossell wrote: Hello, Ah, I thought I was in an open branch. This happens only when updating (fossil update), being in a closed branch. It happens with the latest released version too. fossil update in an open branch works fine. The error surprised me, and I wrote instead of noticing I was not in 'trunk'. 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] Still trouble changing two fields in a ticket
Hello, I wrote a ticket long ago to fossil. We have an 'assigned_to' field. http://www.fossil-scm.org/index.html/tktview?name=13813896d5 If in a ticked Edit I change 'assigned_to' and add a comment, the ticket does not change at all. Nothing new appears in the history either. If I only add a comment, it works. If I only change the 'assigned_to', it works. Both, not. It happend to me with every ticket. Using firebug, I see the 'Post' says, for this case: assigned_to viric cmappnd we have to remember to split the headers csrf6/8D420CD4 effort foundin [de6ac549e7] name78282ff482 owner viric priorityImmediate private_contact resolution Open severityImportant status Open submit Submit Changes subsystem core title Move that thing there typeCode_Defect usernameviric Any idea of what happens? 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] Updating, with files moved
Hello, I had the working directory with some files moved from one directory to another: Something like this, but on three files: fossil mv path/file.txt path2/file.txt mv path/file.txt path2/file.txt edit path2/file.txt ... Then I decide to do: fossil update # being on trunk And to my surprise, the update had lines like: CONFLICT path2/file.txt REMOVE path2/file2.txt ADD path/file.txt ADD path/file2.txt So it updated the working directory quite wrong, if I understand correctly. Some of the files I had were removed. And the 'fossil status' now shows nothing about path2, but all edited in 'path'. All the 'fossil mv' things went away. It seems like today I'm having more troubles than usual with fossil. :) (version [cf178577ec]) ___ 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] Updating, with files moved
On Tue, Nov 23, 2010 at 03:00:10PM +0100, Lluís Batlle i Rossell wrote: Hello, I had the working directory with some files moved from one directory to another: Something like this, but on three files: fossil mv path/file.txt path2/file.txt mv path/file.txt path2/file.txt edit path2/file.txt ... Then I decide to do: fossil update # being on trunk And to my surprise, the update had lines like: CONFLICT path2/file.txt REMOVE path2/file2.txt ADD path/file.txt ADD path/file2.txt So it updated the working directory quite wrong, if I understand correctly. Some of the files I had were removed. And the 'fossil status' now shows nothing about path2, but all edited in 'path'. All the 'fossil mv' things went away. I forgot to mention that none of the files I had modified were modified between the initial ckout and the head of trunk. So it should have been trivial to merge, I think. ___ 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] Still trouble changing two fields in a ticket
On Tue, Nov 23, 2010 at 04:57:21PM -0500, Erik Lechak wrote: Hello, If in a ticked Edit I change 'assigned_to' and add a comment, the ticket does not change at all. Nothing new appears in the history either. If you look at the system log under admin, you will see that there are artifacts that contain the changes you made. But they are not being applied to the ticket. I just wrote about that problem and posted the code that will fix that error. See my last two posts to this group for a more detailed description of the problem and the fix. I've submitted the code fix, but I don't have the ability to check it in. (Can somebody help me with the check-in issue?) If you need this feature to work now without the code fix, you can get around the bug by naming the assigned_to field to xassigned_to. You will need to change it in all of your ticket editing and viewing pages as well. Thank you very much! I also cannot checkin. I hope someone will take the fix in. I'll wait for that. ___ 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] ticket bug fixed, how should I submit it?
On Tue, Nov 23, 2010 at 05:41:46PM -0500, Richard Hipp wrote: On Tue, Nov 23, 2010 at 5:31 PM, Erik Lechak e...@lechak.info wrote: Huh... Then the J-card system appears to be broken. When I have an assigned_to column fossil generates the following: Correct. The ticket-change artifact generator was putting the J-cards in the wrong order. Fixed here: http://www.fossil-scm.org/fossil/ci/e1dac0e4f6 Thank you very much to both! ___ 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] A large repo import suceeded!
On Thu, Dec 02, 2010 at 09:15:55AM -0500, Richard Hipp wrote: Q2: fossil ui is nice. However, I'm missing search - like what git gui gives. What do fossil-ites use for searching the repo? Just straight database search? SQLite has a great full-text search engine built in. I've long thought that it would be great to add an interface to this in Fossil. We could index diffs for all check-ins, all wiki, all tickets, all Blog entries, etc, and then have a Google-like interface for searching for things. Of course, the full text index would likely double the size of the repository file, but in this era of TB-size disk drives, is that really an issue? It's really more of a matter of finding the time to do the necessary hacking I'm happy to hear that! I'd leave that as an option, thought, about doubling or not doubling the repository file. Having the option of a search without indexing, is feasible? ___ 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 should Fossil handle this merge conflict...
On Sun, Dec 12, 2010 at 06:57:56PM -0500, Richard Hipp wrote: Suppose you have the trunk branch checked out and you have made changes to file xyz.txt locally, but have not checked them in. Then you do a merge of branch other-branch: fossil merge other-branch The file xyz.txt has been deleted in other-branch. What should fossil's response be? Should it retain the locally edited copy of xyz.txt, or should it delete file xyz.txt? I had added the ticket http://www.fossil-scm.org/index.html/tktview?name=67176c3aa4 regarding to this, because I was concerned with the current fossil behaviour. svn marks that as a special kind of conflict, showing additional lines on svn status. Monotone has very careful ways of interaction for merge conflicts: http://www.monotone.ca/docs/Merge-Conflicts.html For fossil, by now, I think at least a merge conflict should be noted. By now the best I think should be to write appropiate notes in the working directory file, as in the case of usual merge conflicts. The notes could tell whatever happened. If you have not made any local edits to xyz.txt when you do the merge, then Fossil will delete the file. That seems like the right thing to do. But I'm less clear on what the right thing to do is if you have made local edits. Suggestions are appreciated. It could happen that a branch deleted the file, and added it back anew with whole new contents too. Thank you very much, 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] Hello. Anyone for source highlighting?
On Tue, Dec 14, 2010 at 09:40:55AM +1030, Martin Sandiford wrote: I'm in favor. Not really sure what I need to do to help this to happen? Code review anyone? I would really like something comfortable about that. But I don't have any idea of how I would like it to be. And more sad, I can imagine implementations I would not favour. I find the direct comments committed on the source files of the branch hard to beat. On 07/12/2010, at 8:40 PM, Gour wrote: On Mon, 8 Nov 2010 21:51:19 +1030 Martin == Martin Sandiford wrote: Martin Changes are on the experimental branch. It's been tested Martin reasonably well on MacOSX and Linux. I've implemented a Win32 Martin version as well, but this has really only had basic testing. Is there any chance that it ends applied to the upstream? Sincerely, Gour -- Gour | Hlapicina, Croatia | GPG key: CDBF17CA ___ 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] Stash. Was: How should Fossil handle this merge conflict...
On Tue, Dec 14, 2010 at 08:09:58PM -0500, Richard Hipp wrote: On Tue, Dec 14, 2010 at 11:42 AM, Joshua Paine jos...@letterblock.comwrote: It would be nice to have something like `git stash`, too. Probably the biggest thing I miss from git. I've been reading up on git-stash to see if Fossil needs a similar feature. So far I don't see the need, since stash doesn't do anything that Fossil doesn't already handle more or less automatically. Please enlighten me if I'm missing something obvious I agree, I never saw what would be 'stash' useful for, in fossil. When I used git, I used stash though. As in fossil, git users can branch at any point, commit on private branches and all that. But I think that there 'stash' got in because the git manuals somehow end up advising against branching too much. Additionally, I think that git programmers tend up to choose it as it allows more unorganized ways of storing private things. And related to 'stash', I enjoy fossil not having the INDEX and the Working Directory. Thank you, 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] Stash. Was: How should Fossil handle this merge conflict...
On Wed, Dec 15, 2010 at 08:33:29PM +0100, Joerg Sonnenberger wrote: On Wed, Dec 15, 2010 at 12:55:27PM -0500, Richard Hipp wrote: On Wed, Dec 15, 2010 at 10:53 AM, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Tue, Dec 14, 2010 at 08:09:58PM -0500, Richard Hipp wrote: On Tue, Dec 14, 2010 at 11:42 AM, Joshua Paine jos...@letterblock.com wrote: Scenario (2): You are in the middle of a big change when a minor bug report comes in. You stash your incomplete change, fix the minor bug, then pop your stash to continue working on your big change. This is actually the main usage I can think of. Consider a minor variation of this. You have done your big change and want to update to the latest version and see that someone else has done a commit in the mean time. When do you merge? First variant is commit first and merge in the second step. This can be done already, but can make it non-intuitive what the commit did, especially if the merge ends up being non-trivial. The other approach is to merge first and commit afterwards. For that second approach, stash is useful. This last sentence is the part I don't get. How is stash any more useful here that committing to a branch (public or private) or fork and then merging in a separate step? To my mind, it is just yet-another-command to have to learn. Having incomplete changes in the tree is bad for things like bisect. It shouldn't be forced. The big issue here is that merging changes the working copy. If you can make it possible that automatic merges can be done directly, without changing the working copy, that would be good enough for this purpose. I prefer the current fossil undo option (with later commit to a branch), and I don't like much those automatic merges done directly, unless they are optional. The fossil undo + new branch, for those who believe in saving as much as possible in the history of the file tree, even encourages the public resolution of the merge. For those not wanting to save that publicly, those can even use -private. I don't think we need 'stash'; at most, I think we would get advantage of: - a precise description of what fossil undo is going to do in any case. Maybe it is only my trouble, but I'm not sure what will happen if I run undo after I changed things after fossil merge, for example. - and a reliable way of detecting if the merge is trivial or not, to be able to to undo + branch as soon as possible in case of non triviality. The recent improvement on notifying conflicts goes in that direction, I think. 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] Stash. Was: How should Fossil handle this merge conflict...
On Wed, Dec 15, 2010 at 11:10:17PM +0100, Joerg Sonnenberger wrote: On Wed, Dec 15, 2010 at 10:50:52PM +0100, Lluís Batlle i Rossell wrote: On Wed, Dec 15, 2010 at 08:33:29PM +0100, Joerg Sonnenberger wrote: Having incomplete changes in the tree is bad for things like bisect. It shouldn't be forced. The big issue here is that merging changes the working copy. If you can make it possible that automatic merges can be done directly, without changing the working copy, that would be good enough for this purpose. I prefer the current fossil undo option (with later commit to a branch), and I don't like much those automatic merges done directly, unless they are optional. The trouble with fossil undo is that it throws away the state at some point, e.g. it very volatile and I wouldn't trust it with my data. There is fossil redo, that should put the working directory in the same state as before the undo (regardless of any later changes after the undo). Is it? Automatic merge + commit should definitely be optional behavior. It might make sense to use it as default and fall back to manual merging otherwise. The fossil undo + new branch, for those who believe in saving as much as possible in the history of the file tree, even encourages the public resolution of the merge. For those not wanting to save that publicly, those can even use -private. I would prefer to know in advance whether I can merge without problems or not. Problems against the base revision, not the working copy. This is important to decide whether I have to get a new working copy to do the merge, especially when working on a private branch. I think the fossil 'trunk' knows, whether conflicts come from the working directory or the ckecked out version. The summary after 'merge' could indicate: X conflicts with the local changes, Y conflicts with the checked out version. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Implementing the Propagate to descendants single change
I submitted a patch that solves the ticket http://www.fossil-scm.org/index.html/tktview/fcadf658ed282b3a as an attachment to the ticket page. I found very annoying that sometimes I set the color to a branch, but I forget to set the Propagate to descendants flags. Without this patch, fossil requires to *change the color* to set that flag, while I usually don't like being forced to change the color I chose. Note 1: I added a description to the Patch, but the description did not get in! And the patch appeared without any description around. Another bug? Note 2: While I tested the patch, I noticed that *removing* the Propagates to descendants color tag flag does not update the color of the descendants, and they keep on having the color inherited by On the other hand, enabling the flag yes updates the descendants. 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] GLIBC_2.7 not found required by fossil
On Sat, Dec 18, 2010 at 02:05:43PM +0100, јеромонах Виталије wrote: Hello I have installed fossil as cgi script on my web server and it works just fine :-) I wished to make small change to the fossil source and I have rebuild it from source. Everything was fine on my home computer. But when I deployed my own version of fossil executable on server and tried to execute it I got some error message about missing library. If you built with glibc, I imagine you linked fossil dynamically to it. Althgouh most programs linked with old glibc versions can then be used dynamically linking with newer glibc, the opposite is less true. Does your server have a glibc older than your computer? I have also noticed that my build version of fossil is about 2.4M, while official version is 800k. Can you try to strip yours? strip -s fossil. 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] GLIBC_2.7 not found required by fossil
On Sat, Dec 18, 2010 at 05:23:45PM +0100, јеромонах Виталије wrote: to: Lluís Batlle i Rossell I build it with -static option added to LIB variable. Now it works but it's size is (even after strip) is 1.5M. A funny thing is that now when building I got the following warning: Normal - now the fossil executable has the libc and openssl code in it, instead of loading it from other files like before (dynamically linked). Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking This is what I told you about glibc not being able to be linked as a static library *totally*. The Name Services get dynamically linked always. As I understand these warnings warn me that at runtime there must be installed glibc version that is used for linking. However, it seems that it is not needed or at least not the same version as warning says. At runtime you need the dynamic libraries related to name services in order to get name services working (like DNS requests on http connections, if you use host names in the urls). Isn't it strange, or I misunderstood the warning? Am I wrong assuming that warning should be given when built executable actually needs shared library of specific version to function properly. It is just to avoid surprises to you, if you don't have compatible name services dynamic libraries in the system where you will run fossil. Name resolution will not work in that case. 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] Cannot get a checkin synced
We had a fossil server 2010-10-05 on linux-i686, and clients with fossil 2010-12-07. In a client we committed a change. Synced with the server, and the server showed the change in the timeline (a simple new checkin in trunk). Other clients synced to the server, and they did not get the new checkin. We looked at 'fossil deconstruct', and the ui Admin-Log, and for sure the checkin did not arrive at the clients after sync or pull, no matter how much we retried syncing or pulling. Before debugging deeper, we updated the fossil server version to 2010-12-07, and after that, the clients got the checkin on pull. In the fossil-scm.org timeline I cannot find what can be this related to. Is this a known problem fixed, or it got fixed by chance? 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] Cannot get a checkin synced
On Wed, Dec 22, 2010 at 10:35:52AM +0100, Ramon Ribó wrote: Hello, We have had this problem in the past. A simple workaround is to go to the server ui and edit by hand the checkin, for example changing the commit date or the comment. So, I reported this ticket with details, some time ago, that has troubles related to dates: http://www.fossil-scm.org/index.html/tktview?name=2ee159304e I investigated, whether we were experiencing the same issue (floating point rounding problems serializing it to a string and parsing it back). In the ticket, the problem was that the artifact was in the repository after syncing, but not shown in the timeline. In this new situation, the artifact was NOT in the repositories after syncinc. So I consider it a completely different error. Regards, Lluís. El 22 de desembre de 2010 10:27, Lluís Batlle i Rossell virik...@gmail.comha escrit: We had a fossil server 2010-10-05 on linux-i686, and clients with fossil 2010-12-07. In a client we committed a change. Synced with the server, and the server showed the change in the timeline (a simple new checkin in trunk). Other clients synced to the server, and they did not get the new checkin. We looked at 'fossil deconstruct', and the ui Admin-Log, and for sure the checkin did not arrive at the clients after sync or pull, no matter how much we retried syncing or pulling. Before debugging deeper, we updated the fossil server version to 2010-12-07, and after that, the clients got the checkin on pull. In the fossil-scm.org timeline I cannot find what can be this related to. Is this a known problem fixed, or it got fixed by chance? 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 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] Errors during compile in Windows 7 x64
On Wed, Dec 22, 2010 at 07:29:13PM -0500, Richard Hipp wrote: I spent a very frustrating morning on Monday, downloading mingw and trying to get the makefile to work on a new windows7 box I have sitting off to might right. It appears that getting the makefile to work on win7 will be very hard indeed. If anybody has any hints, I would like to hear them. At the moment, the only thing I can think to do is to completely rework the entire build process to not depend on standard unix tools like make and awk and sed since they just do not work or do not exist on mingw/windows7. mingw is only about the toolchain, and you require more than that. MSYS is a small collection of unix tools built with the mingw toolchain. They don't coincide exactly with the current GNU unix tools, so its 'sed' will work a bit different for example. They can be a bit special on the end of lines too (CR/CRLF). The MSYS prebuilt packages you may find can be very outdated. I don't know who is responsible of maintaining that up to date. What I'd do is to setup a cygwin environment, simply putting the MINGW toolchain in the PATH variable previous to the rest of gnu cygwin pieces (its binutils, gcc, ...), but make your program use the cygwin awk, cygwin sed, ... You can use the GNU make coming with cygwin too. That will give you an OS environment very much like what you would get in GNU/linux. I also have a brand new copy of VS2010 on my brand new win7 box. Does anybody have any suggestions on how we might get VS2010 to compile Fossil? Recognize that (as with most of the software I write) the source code is not really C code, but rather text that looks a lot like C but which gets additional processing prior to being input to the C compiler. In the case of Fossil, the C-source-modules are first processed by a program (source code included) called mkindex, then another program called translate, then a third program called makeheaders. Then there is an AWK script that runs to generate some additional header information. Finally, the output of all of the above is ready to go into the C compiler. But VS2010 seems to be of the opinion that all source code should be plain and simple C code (or C# or whatever) and not require any preprocessing by other utilities. You can build fossil with any Express (free) edition of Visual Studio (with the Visual C compiler). VS2010 Express is just fine. It comes with a batch script that will put all its programs in the PATH. It also puts an icon in Programs to start a CMD shell calling that batch script. From that on, you have on PATH: cl.exe - the compiler link.exe - the linker They require few parameters to go on, and if I recall correctly, with good defaults. You have to learn how they generate .obj from .c (cl file.c may be enough). And link /output:fossil.exe a.obj b.obj ... can also go on fine. The MSVC tools come with 'nmake' (their implementation of 'make', with a syntax slightly different than GNU make, but very close; but it does not like slashes for paths, for example, iirc). They come with 'vcbuild' (It can build vcproj files). 'vcproj' files are XML descriptions on how to build ONE target from a group of source files. People usually create it with the devenv.exe (the GUI frontend to all those things, editor included). They come also with 'msbuild', to build solutions. Solutions group multiple vcproj files (so multiple targets), so for example you can have a solution that builds a Library and a Program linked to that library, whereas with 'vcproj files' alone you would only be able to build one target. If you want to use the MSVC compiler, I'd go with cygwin too. Then you have gnumake, and other current gnu unix tools. Simply prepare your compiler instructions to issue a cl file.c /out:file.obj or however that is done instead of gcc -c file.c, and you are done. Personally, I barely use windows other than through cygwin's bash and rxvt or sshd. Then I always prefer to have tools like 'fossil' built on cygwin instead of raw Windows. I may be able to answer in more detail, on questions about more detail. 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] Errors during compile in Windows 7 x64
On Thu, Dec 23, 2010 at 09:24:46PM +0100, Lluís Batlle i Rossell wrote: You can build fossil with any Express (free) edition of Visual Studio (with the Visual C compiler). VS2010 Express is just fine. It comes with a batch script that will put all its programs in the PATH. It also puts an icon in Programs to start a CMD shell calling that batch script. From that on, you have on PATH: cl.exe - the compiler link.exe - the linker I forgot to mention... whether to build in i386 for i386, or in i386 for amd64 (cross build), or in amd64 for amd64, it only depends on what is on the PATH (and some other environment variables, like the Windows SDK version). There are batch scripts that place whatever toolchain you need ready to be used in the PATH. Regards again, 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] Problems merging with renames
Hello, we had a bad merge, using the latest released fossil (2010-01-01). The merge was removing files it should not remove. Hence I write to the list alerting on the problem. We tracked the problem, and attached proposed patches, in two tickets: http://fossil-scm.org/index.html/info/c9d454153e http://fossil-scm.org/index.html/info/74413366fe They are both related to merges with renames. 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] Hang committing on cygwin
Hello again, with better news. On Tue, Jan 04, 2011 at 04:31:03PM +0100, Lluís Batlle i Rossell wrote: Now we are experiencing a hang after saving the commit message. It's at 100% of cpu. We tried a -g -O0, and attaching gdb, but gdb is not any good at resolving the call stack while in a windows syscall. And I doubt we can use windbg, with the debug information from gcc. Any idea of what we can do? procmon helped, and by chance we could stop gdb in a point where it had a correct frame stack. I wrote the details and the patch we used in http://fossil-scm.org/index.html/info/a4295406dd 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] cannot access baseline manifest
Hello, On a fossil update trunk, I got this output: $ fossil update trunk Autosync: http://blabla@blabla/blabla Bytes Cards Artifacts Deltas Sent: 130 1 0 0 Received:4494 97 0 0 Sent:1540 31 0 0 Received: 16463127 9 21 Total network traffic: 1376 bytes sent, 8637 bytes received fossil: cannot access baseline manifest Running 'update trunk' again, it looked like working. It's linux x86_64, fossil 2011-01-13. Any idea? Do I have to worry? 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] Bug at baseline/delta manifests, workaround using 'rebuild'
On Tue, Jan 25, 2011 at 07:36:49PM +0100, Lluís Batlle i Rossell wrote: Hello, I updated the fossil version I had in one computer from 2010-11-17 to 2011-01-13. I run the fossil rebuild (Btw, it said 100.1% completed at the end), and synched to the main repository. I noticed that the timeline was showing all the changes until today at ~15:00 in trunk, but was not showing any of the changes after that time in trunk. For other branches, they were there. Today a coworker hit the same problem, with fossil 2011-01-07. He was not updating fossil... simply through synchronisations his fossil was not considering any commit after the baseline (the first baseline in that branch, since we enabled the deltas, I think). He had to run fossil rebuild to get the changes beyond the baseline, as I had to do. ___ 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 ui, making web non-admin operations
Hello, we use to share some fossil repository files with the coworkers, and we simply set the committer user name in fossil user default XXX. Running 'fossil ui', I cannot change the web user logged in, and it takes that of the repository administrator. Maybe what I have to do is to use 'fossil serve' bound to localhost, for it to allow me any login? Thank you, 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] newbie failing to log into server...
On Thu, Feb 03, 2011 at 01:36:59PM -0500, Mike Meyer wrote:
However, if I try and log in using the userid/password from the repo,
I get
SQLITE_CANTOPEN: cannot open file at line 27596 of [fabcb6b95e]
SQLITE_CANTOPEN: statement aborts at 28: [UPDATE user SET
cookie='1/6E8AD0C7D6B7CDB96470AE6EF37458A19344AE610099A3D23E',
ipaddr='202.80.186.24', cexpire=julianday('now')+31557600/86400.0 WHERE uid=1]
Database Error
It needs access to write new files in the directory where the fossil repository
file lies. I imagine in your situation, the CGI process does not have such
access.
You also need write access to the repository file.
If you don't use a root account for your CGI, you can use a setuid program for
it to have such access to your files. Something like this here explained, but
applied to fossil:
http://vicerveza.homeunix.net/~viric/cgi-bin/offrss/doc/trunk/doc/cgi.wiki
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] newbie failing to log into server...
On Thu, Feb 03, 2011 at 08:15:26PM +0100, Stephan Beal wrote: 2011/2/3 Lluís Batlle i Rossell virik...@gmail.com If you don't use a root account for your CGI, you can use a setuid program for it to have such access to your files. Something like this here explained, but applied to fossil: http://vicerveza.homeunix.net/~viric/chttp://vicerveza.homeunix.net/%7Eviric/cgi-bin/offrss/doc/trunk/doc/cgi.wiki setuid scripts are an option, but are an ugly ancient remnant of more civilized times and are generally frowned upon for security reasons. If i'm not mistaken (and i might be), recent Linux versions ignore the setuid bit (or only allow it on a configurable list of files). And this is why that web page suggests a C program. :) 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] Deploying A Web Application with Fossil and FTP
On Fri, Feb 04, 2011 at 06:12:46PM +0100, Ondrej Nemecek wrote: Hi to all, let say we have web site, which sources are managed using fossil. This web site is running on server and document root can be accessed via ftp. Is there some way to use fossil to deploy changed files to server? It meens to upload specified branch to server via ftp? If not, could be some change do it via cgi? Some time ago I wrote that I'd like a WebDAV fossil interface; I think it would be of great use. It could be implemented gradually. First readonly, and then with versions. But that is hard to do, but it may be a more complete approach than what you suggest. ___ 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] value of a just added column
On Fri, Feb 04, 2011 at 08:01:28PM -0500, Ron Wilson wrote: I added a new column to my tickets table, one that I want to use in the WHERE clause of a SELECT. However, I am unable to devise an expression that matches, on the new column, any of the records that existed before the new column was added. I have tried NULL, '', and whatever other SQL expression syntax I could dig up. What is the value of a newly added column in pre-existing records? I'm not sure, but you may need a 'rebuild'. Have you tried? ___ 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 release pending.
On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: I haven't done an official build of Fossil on a long while. So I'll try to do one on Wednesday. Please let me know if you see any serious problems with the current tip of trunk. Note that I am unable to reproduce the sync problem reported in http://www.fossil-scm.org/fossil/info/fbea61caf0 despite considerable effort. Hello, it's me reporting this problem. We experience this in all our machines, which use fossil versions all from this year. We did not see any of this until we enabled the delta manifests, around december. We do not commit baseline manifests at will; it is fossil thinking it is time to do so. We use mostly linux x86_64, and also some cygwin fossil windows builds, at a commit rate of around 10 commits per day, with quite enough files: $ fossil ls | wc -l 2930 All coworkers experenienced this, all synchronising against a fossil served by cgi. The fossil server is not that new; maybe it dates from late november. Does it matter? It looks like all fossil 'clients' get always the changes on sync, but they are not considered in the checkin DAG. Only after 'rebuild' they become part of the DAG. Tomorrow I can try to reproduce this in a new repository. Who is here using delta manifests in their repositories? Anyone else? I know fossil-scm.org does not use delta manifests. 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] Fossil release pending.
On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: I haven't done an official build of Fossil on a long while. So I'll try to do one on Wednesday. Please let me know if you see any serious problems with the current tip of trunk. I also hit troubles here, under reports claimed to be by 'viric' http://www.fossil-scm.org/fossil/tktview/115e95ac11631d0f3f2cf2427f1a7212999b079e If this triggers some interest... I did not manage to understand why it fails, although I investigated a bit. Thank you, 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] Fossil release pending.
Hello Richard, On Mon, Feb 07, 2011 at 07:02:26PM -0500, Richard Hipp wrote: 2011/2/7 Lluís Batlle i Rossell virik...@gmail.com On Mon, Feb 07, 2011 at 05:55:08PM -0500, Richard Hipp wrote: I haven't done an official build of Fossil on a long while. So I'll try to do one on Wednesday. Please let me know if you see any serious problems with the current tip of trunk. Note that I am unable to reproduce the sync problem reported in http://www.fossil-scm.org/fossil/info/fbea61caf0 despite considerable effort. Hello, it's me reporting this problem. We experience this in all our machines, which use fossil versions all from this year. We did not see any of this until we enabled the delta manifests, around december. We do not commit baseline manifests at will; it is fossil thinking it is time to do so. We use mostly linux x86_64, and also some cygwin fossil windows builds, at a commit rate of around 10 commits per day, with quite enough files: $ fossil ls | wc -l 2930 All coworkers experenienced this, all synchronising against a fossil served by cgi. The fossil server is not that new; maybe it dates from late november. Does it matter? Yes. Older Fossils don't know how to deal with delta manifests. (On the other hand, delta manifests should never be created unless you explicitly ask for them at least once. Once at least one delta-manifest is in the respository, Fossil will feel free to create more, but it will never create the first one without being asked.) I know. We introduced the first delta manifest on December, and we work with deltas since then in all workstations (around 10 workstations, 5 users). So if you have asked for a delta-manifest, please update all Fossil binaries to the latest. Please let me know if this does not fix the problem. All fossil versions we use are aware of delta manifests, even that running as CGI. Simply the CGI is older than the versions we use in the workstations. In fact, the CGI has *never* shown any problem like that of not going beyond new baseline manifests. So it goes like this: Workstation A: - Adds some delta manifests, autosynching with the CGI - At some points, adds a baseline manifest (B1, let's name), autosynching. - Adds more delta manifests, autosynching. Server (CGI, running fossil 2011-01-01, aware of deltas): - It always shows proper branches in the timeline, although there we don't have any opened repository. Workstation B or any other (latest fossil version): - Autosynhing from the CGI, it interchanges all artifacts. - Running fossil update trunk, or looking at the timeline, the last baseline checkin (B1) is the last shown, or the last updated to. Committing anything and autosynching, creates a new leaf on trunk (seen in the CGI), although it thinks it has only one leaf. - fossil rebuild puts the timeline shown as the server, brings in the double leaf, and all delta manifests that were 'hidden' until that moment. If it is Workstation B commiting the baseline manifest, then all others (A, C, ...) experience the same problem, and we need a 'rebuild in them'. The server always shows properly the last state with all deltas taken into account. This happens with every baseline checkin. We noticed the first baseline checkin (after introducing deltas) at the beginning of January. I forgot to mention this CGI server working properly, in previous letters. And I said it was from late november; bad memory. The server is from 2011-01-01, i686-linux. I understand this is hard to track... I would send you a '.fossil' file of a repository in 'that state', but we are managing closed source. Can you suggest at what sqlite tables I should look at? I don't have all the workstations at the 'last checkin' right now, so I imagine I can find one with needs a rebuild. I agree the error looks hard to find. Thank you, Lluís. It looks like all fossil 'clients' get always the changes on sync, but they are not considered in the checkin DAG. Only after 'rebuild' they become part of the DAG. Tomorrow I can try to reproduce this in a new repository. Who is here using delta manifests in their repositories? Anyone else? I know fossil-scm.org does not use delta manifests. 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 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] More on the delta/baseline problem synching
Hello, as I have a repository where I have reproduced the problem http://fossil-scm.org/index.html/tktview?name=fbea61caf0 , I'm investigating a bit. I found this: sqlite .schema orphan CREATE TABLE orphan( rid INTEGER PRIMARY KEY, baseline INTEGER ); CREATE INDEX orphan_baseline ON orphan(baseline); sqlite select * from orphan; 8024|8031 sqlite select * from blob where rid=8024 or rid=8031; 8024|26|257565|5d6a9957808c417aae6f41c8c9cda1dc6e3bffbb| 8031|26|347|66514ffdad03438ddda7145dbedbed7f2e72a294| The first, 8024, is the BASELINE manifest artifact, that shows fine in all fossil operations. 8031 is the next DELTA manifest artifact, that does not show. No artifact after that shows, either. And as I told before, in the many times I've hit this problem, fossil rebuild fixes the situation. I keep on investigating, although of course I don't know much about what fossil should be doing in terms of sql operations/function calls. I'm only trying to ring a bell to drh. 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] SSH status
On Wed, Feb 16, 2011 at 12:25:11PM -0500, Richard Hipp wrote: On Wed, Feb 16, 2011 at 12:03 PM, Chad Perrin c...@apotheon.net wrote: If any reader has suggestions on a better way to do SSH access for Fossil, please speak up. What do you think about what I suggested some time ago in http://www.fossil-scm.org/index.html/tktview?name=115e95ac11 ? That's for the login shell problem. Quoting: Of course, fossil should be using an ssh remote command execution within a non-interactive shell, a non-login shell. That should make the remote interpreter to avoid anything like the MOTD, or any welcome message the user could have set. As fossil is not running ssh in such a way, welcome messages to the shell annoy. I could not find how to call ssh without parameters, without specifying any program to run. On the other hand, running ssh REMOTE sh (run the program sh) would make the shell non-login, so no displaying any welcome message. It could be used to overcome this login problem. But the problem I seconded above was not related to any welcome message. Some repositories sync, some hang, between the very same computers. --- 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] SSH status
On Wed, Feb 16, 2011 at 01:04:56PM -0500, Richard Hipp wrote: On Wed, Feb 16, 2011 at 12:36 PM, Justin Mazzi jma...@gmail.com wrote: What about using regular pipes? exec ssh remote-server 'fossil command to output raw server data' | fossil receive data Multiple round-trips from client-server-client are required. A simple fork/exec of ssh remote fossil should work better than ssh remote and then sending fossil\n on the other end. I just wonder that maybe you found situations where the 'fossil' command was not found in that case, and then you decided to go for the ssh remote. This is only a misconfiguration of path; the PATH, for ssh remote fossil to work, has to be set in .bashrc and not .bash_profile. Did I guess right? On Wed, Feb 16, 2011 at 12:25 PM, Richard Hipp d...@sqlite.org wrote: On Wed, Feb 16, 2011 at 12:03 PM, Chad Perrin c...@apotheon.net wrote: I'm new to this list. Be gentle. I've been rummaging through the list archives, and sifting through the Web documentation, but I am still not clear on the status of using SSH to encrypt connections for push/pull and other operations using Fossil. Is it stable? Does it require special configuration? Is there anything about it in the Web docs or in any documentation that comes with it? Is it not discussed outside of the mailing list? Any help in answering these (and related) questions would be appreciated. I worked on that a lot, and finally managed to get it to run on my systems. But it seems like every ssh implementation is a little different, and those differences are causing problems for some users. My current approach is to run ssh to a shell on the remote side and then issue shell command over the wire that invoke Fossil multiple times to act as a server for the client-side protocol. It's all a bit dodgy. A prior approach was to run ssh to a single instance of the Fossil server with the TCP/IP tunnelling and then just do the usual TCP/IP client/server exchange over the tunnel. That seemed to work more reliably and across a wider variety of systems. The difficulty was in choosing an unused TCP port on the remote end. There was also a security concern that another process on the same system might try to sneak information through on that same TCP port. I looked at the scp source code. They seem to use the first method above, the current method, of sending multiple commands a cross an ordinary ssh connection to a shell. But I might have been misunderstanding the code - it was hard to follow. If any reader has suggestions on a better way to do SSH access for Fossil, please speak up. -- Chad Perrin [ original content licensed OWL: http://owl.apotheon.org ] ___ 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 -- Justin Mazzi ___ 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] SSH status
On Wed, Feb 16, 2011 at 02:36:16PM -0500, Richard Hipp wrote: OK, so I've made some tweaks to the SSH code based on the many helpful suggestions sent in by readers. (Thanks!) Now the ball is back over to you, Chad. Go forth and test. Let us know about both your successes and failures. Looking forward to you report! Thank you! It works for me. As I added to http://www.fossil-scm.org/index.html/info/115e95ac11 I wonder why you chose 2 for transport_load_buffer, and not 1, or changed the approach alltogether. Did you notice that -e none -T was already in the zDefaultSshCmd? Maybe you could remove it in zDefaultSshCmd now. 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] raw (internal) wiki pages
On Wed, Feb 16, 2011 at 04:19:08PM -0500, Ron Wilson wrote: For a wiki page created through the UI, is there an URL to access the raw page? I tried replacing /wiki?name=mywikipage with /raw?name=mywikipage, but that did not work. This is related: http://www.fossil-scm.org/index.html/tktview?name=7c36bea9f3 ___ 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 status
On Thu, Feb 17, 2011 at 11:42:19AM +0100, Stephan Beal wrote: 2011/2/17 Lluís Batlle i Rossell virik...@gmail.com i have a bashrc configured on that box, which includes ~/bin in my path, and my bash_profile simply sources bashrc, but the hoster has apparently done something to their ssh which causes those to be ignored. If i log in without sending a command then i get my fully-configured environment. I've had troubles with 'dropbear' loading the proper scripts. Does your provider use openssh? 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] 3-way merge likely to happen anytime soon?
On Mon, Feb 21, 2011 at 08:23:42AM -0500, Richard Hipp wrote: Just to clearify, by 3-way merge, you mean a graphical merging tool? I ask because Fossil always has done a 3-way merge behind the scenes - it just doesn't show you what it is doing or give you the opportunity to intervene. I imagine he refers to add the possibility of launching the user favourite 3-way-merge program in case of conflicts, to avoid the laterresolution through '' marks. On Sun, Feb 20, 2011 at 1:56 PM, Matt Welland estifo...@gmail.com wrote: I saw a prior thread on this topic but I am not clear on if any action was planned. Not sure yet why but I'm getting a lot more merge conflicts than I did with Monotone. If nothing is being worked on I'll make a perl script helper as fixing merges by editing the files with markers is really tedious. FYI, my preferred three way merge tool is kdiff3 with xxdiff being a close follower. ___ 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] A helper function I have for a shorter commandline
On Wed, Mar 02, 2011 at 09:05:55AM -0800, Andreas Kupries wrote: http://paste.tclers.tk/2370 Hello, $@ is what you want for quoting arguments maintaining spaces. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Merges, renames and shortest path.
Hello, we had an issue merging with renames here. The 'test-shortest-path' takes what we think is a *WRONG* path for the merge to happen. We had two long-standing branches, that both were updated from trunk from time to time. One was merged into trunk only recently, altough it has been there for two months. We once did in branch A a fossil merge trunk at the end of January. We worked a lot in trunk after that. This gave the current common ancestor between A and trunk. Recently we did in branch B a fossil merge trunk, and then in trunk, fossil merge B. It came the day when whe decided to do, in branch A, refresh it from trunk: fossil merge trunk. Then it went wrong, because it found the shortest-path *THROUGH* branch A, that went to trunk and branch A back in mid december. We had little changes in A, and lots of changes in trunk. Through 'A' was the *shortest path*. So in this case, the shortest path (smallest number of commits) was not going through the common ancestor between A and trunk (of end of January), but through some common ancestor one month older. This could have worked, if the first merge of the end of January did not have any rename. It had renames, and due to this, the last merge attempt complained about this like this: WARNING - no common ancestor: file1 WARNING - no common ancestor: file2 WARNING - no common ancestor: file3 WARNING - no common ancestor: file4 So we propose that, for the merge between two branches, it should be calculated through the *shortest path* that (additional condition) goes through the *common ancestor*. What do you think? Here is how the test-shortest-path trunk A looks like: 1: c844ce6d50e0 2011-03-03 14:14:51 is a child of (trunk) 2: a43678fc9ca0 2011-03-03 14:12:18 is a child of 3: 828a14d063c4 2011-03-03 11:54:30 is a child of 4: edb41e5c230b 2011-03-03 11:13:09 is a child of 5: e1b7b9c9aabc 2011-03-03 09:48:33 is a child of 6: 6426c87f9132 2011-02-24 08:22:45 is a child of 7: 3ce0d541f673 2011-02-23 21:12:02 is a child of 8: 99319ca24ef5 2011-02-23 15:15:59 is a child of 9: deda6f59bdd4 2011-02-23 13:55:02 is a child of 10: c0d55468828c 2011-02-23 10:29:18 is a child of 11: b664b5b18bcd 2011-02-23 09:11:10 is a child of 12: 241698eda20c 2011-02-23 09:06:37 is a child of 13: d892a84a853b 2011-02-22 09:13:40 is a parent of 14: 1d669cc444e7 2011-02-22 13:43:04 is a child of (branch B) 15: c788f28c5660 2010-12-22 15:09:28 is a child of 16: 8ed57277e997 2010-12-22 13:20:11 is a child of 17: 87c26be24920 2010-12-22 13:18:27 is a child of 18: 6478caeac746 2010-12-22 10:03:02 is a child of 19: 6a13f33daba8 2010-12-22 09:41:06 is a child of (trunk again) 20: b215075e199d 2010-12-21 15:03:20 is a parent of (branch A) 21: aa1588e4ffc3 2010-12-22 11:41:32 is a parent of 22: 799ee1a58db1 2010-12-22 13:27:11 is a parent of 23: 75a94cb02cd6 2010-12-22 15:11:03 is a parent of 24: ed258cef647f 2010-12-22 16:20:38 is a parent of 25: 0bcba8b051c6 2010-12-22 16:21:18 is a parent of 26: e793f744c587 2010-12-23 09:18:59 is a parent of 27: b1681a484058 2011-01-24 11:55:03 The common ancestor between A and trunk dates from 2011-01-24, two hours earlier to the last element of the test-shortest-path above. ___ 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] Merges, renames and shortest path.
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote: 2011/3/3 Lluís Batlle i Rossell virik...@gmail.com This could have worked, if the first merge of the end of January did not have any rename. It had renames, and due to this, the last merge attempt complained about this like this: WARNING - no common ancestor: file1 WARNING - no common ancestor: file2 WARNING - no common ancestor: file3 WARNING - no common ancestor: file4 Can you use the --baseline option to merge to specify the common ancestor checkin that you want the merge to use? It gives exactly the same behaviour as without it, if we set the --baseline to the output of fossil test-find-pivot A trunk. I always thought the merge used always the 'shortest path', instead of what the description of --baseline says about: ... instead of the nearest common ancestor. Thank you, 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] Failure in the test
On Thu, Mar 03, 2011 at 10:52:18AM -0500, Richard Hipp wrote: 2011/3/3 Lluís Batlle i Rossell virik...@gmail.com Hello, we were updating to fossil of the 1st of March, and running its 'make test' we've seen one error: /tmp/nix-build-ry80yizb2mhli5yr7la7by5dn8w6cjdd-fossil-20110301190432.drv-0/fossil-src-20110301190432/fossil test-3 t1 t2 t3 a23 test merge1-7.2 FAILED! Richard, can you look at it? I already did and fixed it in a subsequent check-in. It is nothing to worry about. Ah ok. Btw, do you know that make test does end up in return 0, even if a test fails? I luckily had looked at the log, but otherwise I would not have noticed. ___ 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] Merges, renames and shortest path.
On Thu, Mar 03, 2011 at 10:57:06AM -0500, Richard Hipp wrote: 2011/3/3 Lluís Batlle i Rossell virik...@gmail.com On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote: 2011/3/3 Lluís Batlle i Rossell virik...@gmail.com This could have worked, if the first merge of the end of January did not have any rename. It had renames, and due to this, the last merge attempt complained about this like this: WARNING - no common ancestor: file1 WARNING - no common ancestor: file2 WARNING - no common ancestor: file3 WARNING - no common ancestor: file4 Without --baseline, merge uses the nearest common ancestor, as determined by the same algorithm used for test-find-pivot. The test-find-pivot command is (as its name suggests) a test procedure used to test and debug the algorithm for finding the nearest common ancestor. Ah, the test-shortest-path may be for the bisect. I mixed things. So you are saying that test-find-pivot is not finding the ancestor you think it ought to be finding? Maybe the problem is in the handling of renames, then, and I mixed all with the 'shortest-path' algorithm, which may have played no role. Sorry for this noise. So no wonder that with --baseline or without it, it behaves the same. test-find-pivot finds properly the ancestor, but I don't understand why it thinks there is no common ancestor for those files. A trunk c4| = At this point we're running fossil merge trunk, saying those WARNINGS |... | | | | c3| = the rename got into the branch A through fossil merge trunk \ | |\| | \__c3 = Common ancestor found by test-find-pivot | | | | | | |c2 = rename of files \ | \| \ | \_c1 Do you see what may be going wronG? ___ 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] Hang while waiting for server when using ssh
On Thu, Mar 03, 2011 at 09:35:43PM +0100, Jan Danielsson wrote: Hello, I have run into this problem: http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/3515 Though I'm using NetBSD/amd64 5.0 (client) against a NetBSD/amd64 4.0 (server). And I'm using key based authentication rather than entering username and password. And another difference is that Martin mentions that it had worked previously, whereas for me it has been 100% reproducible from the start. I am using fossil version [d0753799e4] 2010-11-01 14:23:35 UTC. The latest fossil version has that corrected, for what I recall. ___ 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 merge conflicts.
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote: Several times when making merge with fossil, I ended up with really strange conflicts like this: BEGIN MERGE CONFLICT: original content first include '%TargetOS%/mouse.asm'=== original content above; conflict below = include '%TargetOS%/mouse.asm' END MERGE CONFLICT: conflict last In one merge, there was 4..5 similar conflicts and none of real In my opinion, both lines are totally equal. Is it a bug or I am missing something? Can it be a difference on the end of lines? ___ 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 on IIS
On Fri, Mar 04, 2011 at 04:27:44PM -0600, Tony Perovic wrote: Q: How should the CGI script invoke Fossil to request these internal resources? The CGI is quite a defined interface, telling any query information through environment variables, and expecting any answer in stdout. ___ 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] Cygwin Build
On Sat, Mar 05, 2011 at 05:55:59AM -0800, Anthony Jefferson wrote: I realize that Cygwin does not build real windows executable. However, I already have a Cygwin development environment on my desktop and I just wanted to compile and build the source locally. Is there an existing Cygwin makefile or one that you would suggest I modify? I searched the mail archives and know at least a few people tried this. On windows, we always built fossil for cygwin. We unpack the tarball, type 'make', and it always worked. ___ 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] meld-support
On Tue, Mar 08, 2011 at 01:12:22PM -0500, Richard Hipp wrote: On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson jan.m.daniels...@gmail.comwrote: Hello, Anyone here using meld[1]? When merging with many conflicts I find meld to be of invaluable help, though I noticed that meld is missing explicit fossil-support. Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? I've never used it for 3-way merge; for me it's like an editor with two files asside and its diff graphically. Something like a more graphical vimdiff, with mouse control and all that. I use it as it has a comfortable directory diff, quick merging by mouse, and an acceptable editor for any new text I may have to type. In fact, I use to review branches using meld, but setting one directory with a fossil checkout of the branch leaf, and then another directory with the pivot to the branch I want to merge to. Then I run meld between the two directories. ___ 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] meld-support
On Tue, Mar 08, 2011 at 01:15:48PM -0500, Richard Hipp wrote: Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? Can meld be plugged into Fossil using the gmerge-command setting? While we're on the subject, should the gmerge-command setting be extended to be smart about commonly used graphical merges. Should you be able to say just: fossil setting gmerge-command kdiff3 and fossil would know to add the %baseline %original %merge -o %output arguments onto the end automatically? Similar automatic arguments would apply to xxdiff and meld, perhaps? Or is that a case of the software trying to be too clever? I think that's too clever. I'd keep fossil simpler. Nevertheless, I recall the 'unison' configuration file, and how it deals with it, as that may be an interesting reference: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html#merge 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] cookies for multiple cgis in the same server
Hello, we have some fossil repositories served in the same server through different CGI URLs, and from the version 2011-01-01 to 2011-03-01 we noticed the change that while with the first version I could have a cookie for each of the repositories at once, and since the last update, logging into one repository takes me out of the other. Is this intended? I can accept this, but I find this a bit annoying. 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] cookies for multiple cgis in the same server
On Wed, Mar 09, 2011 at 06:09:28AM -0500, Richard Hipp wrote: 2011/3/9 Lluís Batlle i Rossell virik...@gmail.com Hello, we have some fossil repositories served in the same server through different CGI URLs, and from the version 2011-01-01 to 2011-03-01 we noticed the change that while with the first version I could have a cookie for each of the repositories at once, and since the last update, logging into one repository takes me out of the other. Is this intended? I can accept this, but I find this a bit annoying. I haven't changed anything in relation to cookies. And this would certainly not be an intentional change, since I myself keep multiple logins going at the same time. But on the other hand, I haven't had any problems here. Humm now I cannot reproduce it. Sorry for the noise. Maybe there is a timeout I did not notice before? I'll write if I have any more detail. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Annotate for wiki pages
Hello, is there a way I can get an 'annotate' for wiki pages? Thank you, 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] git equivalent commands
On Fri, Mar 11, 2011 at 06:58:59PM -, Eric wrote: On Fri, March 11, 2011 7:27 am, Federico Ramallo wrote: Hi, I was wondering how to do git reset --hard on a fossil repository. Because fossil clean only clear extra files, but what about changed files? 'fossil revert' may be something close? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] changing the date of events
Hello, I tried to create an event for a date different than the one given in the form, and it looks like it does not care on the value of the date field. I see the same editing an event. Does anybody see the same? I'm using Fossil version [1d93222627] 2011-03-01. Thank you, 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] fossil add somefile.rs = Error
On Mon, Mar 28, 2011 at 04:33:04PM -0400, sky5w...@gmail.com wrote: Hi, I get the following error attempting to add a file with the Ampersand() in the file extension. Fossil wrote: 's' is not recognized as an internal or external command, operable program or batch file. Isn't it your shell, telling that? '' stands for launch the left process in background and run that of the right. ___ 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] Summary of i18n status, for inclusion into Fossil introduction wiki
On Wed, Mar 30, 2011 at 01:32:17AM +0900, Clifford Caoile wrote: Hello fossil-users: I was intrigued with Fossil after reading the enthusiastic LWN article [1]. Unfortunately I do not see any summary about Fossil and Internationalization (i18n). Let me contribute a summary which can be used on the Fossil wiki. I agree with your summary. I also understand the current status that way. ___ 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 on Hammer Principle
On Fri, Mar 25, 2011 at 12:31:09AM -0400, altufa...@mail.com wrote: It doesn't have ClearCase!!! OMG They may count only free VCS. It lacks monotone though. -Original Message- From: Stephen De Gabrielle stephen.degabrie...@acm.org To: fossil-users@lists.fossil-scm.org fossil-users@lists.fossil-scm.org Sent: Fri, Mar 25, 2011 1:59 am Subject: Re: [fossil-users] Fossil on Hammer Principle Cute. It seems pretty accurate. IMHOS.On Thursday, March 24, 2011, Alaric Snell-Pym ala...@snell-pym.org.uk wrote: Hello! Hammer Principle is a whimsical site where people can rank contentious things on various axes, and it then generates overall scores for stuff. They added version control systems lately, and Fossil's one of them: http://versioncontrol.hammerprinciple.com/ However, as of the time of writing, only two people have expressed opinions on Fossil (and I'm one of them). Let's fix that :-) Enjoy, ABS -- Alaric Snell-Pym http://www.snell-pym.org.uk/alaric/ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users-- --Stephen De Gabriellestephen.degabrielle@acm.orgTelephone +44 (0)20 85670911Mobile+44 (0)79 85189045http://www.degabrielle.name/stephen__ _fossil-users mailing listfossil-users@lists.fossil-scm.orghttp://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] Commit Question
On Thu, Apr 07, 2011 at 02:39:30PM -0500, Bill Burdick wrote: Are you on *NIX or Windows? If you're on *NIX, you can use fossil commit $(find dir -type f) or find dir -type f | xargs fossil commit I think it is not that easy! :) fossil commit only likes the files that have changed. On Thu, Apr 7, 2011 at 5:14 AM, Anthony Jefferson ac_jeffer...@yahoo.comwrote: Typically when I do a commit I simply do : fossil commit From inside the tree of managed artifacts. However, yesterday I realized I was working on 2 different problems and wanted to commit only the single directory tree I was in. I looked up the syntax a realized I could give the commit command a list of files. Question: Is there a way to do a commit on an sub-hierarchy of files e.g. commit from a starting directory? I got the effect I wanted using individual files but it would have been easier to simply supply a directory name such as: fossil commit directory-x Thanks, Tony Jefferson ___ 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] Opening a repository on webdav
On Wed, Apr 20, 2011 at 04:11:23PM -0400, Richard Hipp wrote: On Wed, Apr 20, 2011 at 4:00 PM, Tomek Kott tkott.s...@gmail.com wrote: So, to the crux of the matter. I set up a new fossil repository (in ~/fossil/) using fossil new site.fossil. I then cd to my mounted drive (cd /cygdrive/c/htdocs/) and then try to open a local fossil repository via fossil open ~/fossil/site.fossil The result is the following error: I imagine you meant '/cygdrive/not_c/hydocs'. In any case, I'm not any sure that webDAV supports random access at all. It may be that it is up to the client whether to give that API to the programs using the filesystem. Maybe Windows offers read-only random access, but not for writing. Maybe it is up to the webDAV server. I imagine fossil requires random access for both reading and writing. Could it be so? I don't know if there are particular checks about this file capability. 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] leaves which i cannot close?
On Fri, Apr 22, 2011 at 11:59:09AM -0400, Richard Hipp wrote: You might argue that we should change the definition of leaf to be A node that as no children of any kind (merge or non-merge) with the same branch tag. I'm not sure what the consequences of that change would be, but I'm betting there would be some and that they would be subtle. Do you think we should try it? I personally prefer the current definition of leaf, over this above. 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] HTML comments in wiki pages
Hello, I try to write text inside wiki files that will not be shown on web browsers. I see that !-- -- text gets displayed. Shouldn't it better be hidden, as normal html would do? Or there is another way for achieving what I want? Thank you, 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] Problems with annotate
Hello, I have problems with annotate giving misleading information. I wrote a ticket: http://fossil-scm.org/index.html/info/f0f9aff371 Maybe asking for a mass 'please try to reproduce it', we can get a public repository which shows the same problem. Regards, Lluís. (Copy of the ticket text below) -- I've a branch where I'm interested on the source of this line of code, at point 2011-04-28: const bool debugErrorToFile = true; Looking at annotate, I see: ad13e86e1e 2010-09-28 llbatlle: const bool debugErrorToFile = true; I don't trust it.. and I find a commit in the same branch, on 2011-04-08, that introduced the change. So, annotate was not showing it. I write a commit today (2011-05-05), setting back the debugErrorToFile to false. Then I test annotate again, expecting to see the very recent commit. But I get: 8c918ba0e2 2010-10-25 llbatlle: const bool debugErrorToFile = false; So, annotate is getting confused somehow. I can completely reproduce it, but I cannot give the repository as it contains private files. ___ 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] trouble with 'localauth'
On Fri, May 06, 2011 at 10:42:16PM +0100, Jacek Cała wrote: The same for me fossil new xxx.fossil fossil ui xxx.fossil does not log in me automatically (Opera, Firefox). I forgot to add I use x64 win7. Perhaps it matters that this is x64 or win7 x64. Anyone else with different win or win7 x32? For what I know, this is fixed in fossil trunk. I was experiencing this recently on linux, but not with fossil trunk. 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] WHY IS FOSSIL REMOVING ALL MY CODE!
On Sat, May 21, 2011 at 02:32:34PM -0400, Richard Hipp wrote: the fossil revert overwrote the undo stack. Maybe to prevent this, I should implement a multi-level undo? Does anybody have any other suggestions on how to prevent the lose of uncommitted work? I've lost sometimes work with this issue, specially when there were few messages telling about conflicts and things like that. I'm not going to implement a multi-level undo, but I'd enjoy it a lot! Thank you, 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] Supporting markwon syntax for wiki
On Wed, May 25, 2011 at 01:43:14AM +0800, Ambrose Bonnaire-Sergeant wrote: 2011/5/24 Natacha Porté nata...@instinctive.eu As a fossil user, I would love to have the option to use Markdown in the wiki (with the option of dumbing down to forbid inline HTML which might be unsafe -- exactly the same option as it exists today). +1 As for me, I don't need it... but in another project I use libupskirt, a C library for Markdown parsing, that may be of interest to the people here: http://fossil.instinctive.eu/libupskirt/index ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Worried about merges
Hello, I'm still quite worried on merges, due to the problem I described here some days ago: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg04716.html Am I the only one worried on silent bad merges? Thank you, 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] 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
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
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? What do you think about the problem? Do you understand it already, or you would really like a repository with the troubles, in order to start? I'd have to recreate one artificially, to show the problems, as I've only seen that in the private repository we use (which we use extensively). ___ 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 Thu, Jun 02, 2011 at 06:24:16AM -0400, Richard Hipp wrote: 2011/6/2 Lluís Batlle i Rossell virik...@gmail.com What do you think about the problem? Do you understand it already, or you would really like a repository with the troubles, in order to start? I'd have to recreate one artificially, to show the problems, as I've only seen that in the private repository we use (which we use extensively). Please send a reproducible test case if you can. Got it! I had to understand the trouble in even more detail to get the case. You have the repository there attached. We are hitting this trouble almost once every week, having to tweak the merges so our files don't disappear. http://fossil-scm.org/index.html/tktview/554f44ee74e3d3b9b24edd358f2bc3d8284f9ce5 I hope you can dedicate some time to fix it. It would solve us many headaches. And even more to those who are not aware of the magically disappearing files. 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] Needed: volunteer to autoconf Fossil
On Tue, Jun 14, 2011 at 05:42:49PM +0200, Stephan Beal wrote: Another suggestion nobody has made yet: jam. It can be distributed in static-binary form directly with the source tree (i've seen this done in a couple projects, and i know it can build on some rather obscure systems). i can't personally speak for jam's usability - read about it but never used it myself. It takes 2GB of RAM for jam to build boost, compilers and linkers apart. I don't think it scales any well. In my projects I use cmake, but I don't know how portable it is beyond the usual OSes around. I've used it succesfully for cross-compilation too, without troubles. I clearly understand the advantages of a good autotools *result*: a shell script that works in many places. That's outstanding compared to the rest of tools proposed, so although I will not do the work on making fossil autotools-ready, I understand the people wanting it. 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] problem importing from git
On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote: On Jun 29, 2011, at 3:53 AM, John Nowak wrote: $ fossil reconstruct foo.fossil . fossil: SQLITE_ERROR: table blob already exists fossil: table blob already exists Just realized I did this wrong. I'm new to fossil obviously. Still, deconstructing and then reconstructing results in the same error. No error occurs on deconstruction. Still stuck. 'foo.fossil' should not exist before 'reconstruct'. Does it exist? ___ 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] problem importing from git
On Wed, Jun 29, 2011 at 07:08:52AM -0400, John Nowak wrote: On Jun 29, 2011, at 4:11 AM, Lluís Batlle i Rossell wrote: On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote: On Jun 29, 2011, at 3:53 AM, John Nowak wrote: $ fossil reconstruct foo.fossil . fossil: SQLITE_ERROR: table blob already exists fossil: table blob already exists Just realized I did this wrong. I'm new to fossil obviously. Still, deconstructing and then reconstructing results in the same error. No error occurs on deconstruction. Still stuck. 'foo.fossil' should not exist before 'reconstruct'. Does it exist? No, I was deconstructing and then reconstructing a new foo2.fossil after I understood how the command works. I can't open that one either though; same not a valid object name error. What fossil version? (Not that I know how to fix it, but this may be useful for the code owner who can fix it) ___ 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] changes status cmds within sub-directory
On Sun, Jul 10, 2011 at 10:12:33AM -0400, Joshua Paine wrote: On 7/10/2011 9:11 AM, Ben Summers wrote: $ fossil status In sub-directory two: ADDED world.txt EDITED src/display.c 1 other change. Use --show-all option to list all changes. I would rather it work like git and show other changes as well, but relative to the current location. E.g., ADDED ../one/hello.txt ADDED world.txt EDITED src/display.c I prefer this, over all presented in the thread until now. ___ 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] Shun old versions of (large) binary files
On Thu, Jul 14, 2011 at 06:17:07PM +0200, Marco Maggesi wrote: Hi, first of all let me say that fossil is an excellent piece of software. I use it everyday. Thank you for developing and supporting fossil. I have a small problem and i wonder if it can be easily solved. (Perhaps with some clever usage of branch and tags etc.) My question is: Is it possible to selectively shun all binary files that exceed a certain age? Here selectively means files that are stored under a given directory or are tagged in some way. In that case, I'd deconstruct, and try to get a list of the biggest artifacts, easy to do once they became files. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Converting from mercurial
Hello, As the lack of friendlyness I've always felt with git, before using fossil I used mercurial. If I wanted to convert any mercurial repository to fossil, how should do that? Has anyone done that? 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
