Re: [fossil-users] [VB.Net] Ignoring .suo safe?
On Mon, 7 Jan 2013 15:54:50 +0400, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: *.sln *.resx *.user *.vb *.vbproj *.settings *.myapp Seems to be OK, but note that those .user and .settings file are not really a part of the solution's core (I'm not sure I ever saw a .myapp file so have nothing to say on this). What I mean, is that it might be useful to keep these files in the repository, but if you will eventually decide to ship a tarball of your source code (if it's a F/OSS project), then you will probably want to strip those files out. Good to know. Thanks. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Couple of newbie questions on artifacts and comparing
Hello I have a couple of questions about artifact ID's and how to compare two revisions of a file: 1. Am I correct in understanding that any commit creates... - one artifact ID for the commit - one artifact ID for each new revision of a file ... which explains why fossil finfo myfile.c displays two artifact ID's: C:\Projectsfossil finfo myfile.c History of myfile.c 2012-11-25 [ad6f12df62] New version (user: Joe, artifact: [dc79071933], branch: trunk) 2012-11-25 [53ff5087e3] Original file (user: Joe, artifact: [54dff7fa29], branch: trunk) ? In the output above, are 53ff5087e3 and ad6f12df62 the artifact ID of the whole commit this file was part of, while 54dff7fa29 and dc79071933 are the artifact ID of the two revisions of this particular file? 2. For a given file, what is the easiest way to compare two revisions in the repository? Using the example above, I tried this but it doesn't work: fossil gdiff --from 54dff7fa29 --to dc79071933 fossil: no such checkin: 54dff7fa29 Next I tried the first artifact ID: fossil gdiff --from 53ff5087e3 --to ad6f12df62 This works, but it seems to go through all the files that were part of each commit. How can I get gdiff (WinMerge) to compare two revisions, usually the last and before-last revisions? Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Official approved way of moving a repo?
I just finished deleting a few dozen repos since I moved a bunch of source code to another machine and fossil refused to like it. After that I found a discussion on the mailing lists about test-move-repository. Not a big deal since this was all test stuff but I would like to know what the official approved way is to let fossil know a repository has been moved. For example: old repo was in /home/user/code/project copied the project directory including the repo to /newmachine/differentuser/programs/newplace What command(s) should I use to tell fossil the repo now exists in /newmachine/differentuser/programs/newplace? Thanks /jl ___ 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] Official approved way of moving a repo?
On Tue, Jan 8, 2013 at 1:22 PM, John Long codeb...@inbox.lv wrote: I just finished deleting a few dozen repos since I moved a bunch of source code to another machine and fossil refused to like it. After that I found a discussion on the mailing lists about test-move-repository. Not a big deal since this was all test stuff but I would like to know what the official approved way is to let fossil know a repository has been moved. For example: old repo was in /home/user/code/project copied the project directory including the repo to /newmachine/differentuser/programs/newplace The easiest way, IMO, is: fossil close move repo file fossil open --keep /path/to/new/repo The --keep option keeps fossil from overwriting any changes you made between moving and opening the repo. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Couple of newbie questions on artifacts and comparing
On Tue, Jan 8, 2013 at 1:02 PM, Gilles gilles.gana...@free.fr wrote: 2012-11-25 [ad6f12df62] New version (user: Joe, artifact: [dc79071933], branch: trunk) 2012-11-25 [53ff5087e3] Original file (user: Joe, artifact: [54dff7fa29], branch: trunk) ? In the output above, are 53ff5087e3 and ad6f12df62 the artifact ID of the whole commit this file was part of, while 54dff7fa29 and dc79071933 are the artifact ID of the two revisions of this particular file? Correct. It's not immediately obvious, but the first number is the commit UUID and the second is the file artifact itself: zOut = sqlite3_mprintf( [%.10s] %s (user: %s, artifact: [%.10s], branch: %s), zCiUuid, zCom, zUser, zFileUuid, zBr); How can I get gdiff (WinMerge) to compare two revisions, usually the last and before-last revisions? If i'm interpreting the 'diff' help properly... try: fossil gdiff --from 53ff5087e3 --to ad6f12df62 FILE1 ... FILEN :-? -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Couple of newbie questions on artifacts and comparing
On Tue, 08 Jan, Gilles wrote: Next I tried the first artifact ID: fossil gdiff --from 53ff5087e3 --to ad6f12df62 This works, but it seems to go through all the files that were part of each commit. fossil diff --from 53ff5087e3 --to ad6f12df62 myfile.c Greetings, Stefan -- Stefan Bellon ___ 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] Official approved way of moving a repo?
On Tue, Jan 08, 2013 at 12:42:19PM +, John Long wrote: On Tue, Jan 08, 2013 at 01:31:18PM +0100, Stephan Beal wrote: On Tue, Jan 8, 2013 at 1:22 PM, John Long codeb...@inbox.lv wrote: I just finished deleting a few dozen repos since I moved a bunch of source code to another machine and fossil refused to like it. After that I found a discussion on the mailing lists about test-move-repository. Not a big deal since this was all test stuff but I would like to know what the official approved way is to let fossil know a repository has been moved. For example: old repo was in /home/user/code/project copied the project directory including the repo to /newmachine/differentuser/programs/newplace The easiest way, IMO, is: fossil close move repo file fossil open --keep /path/to/new/repo The --keep option keeps fossil from overwriting any changes you made between moving and opening the repo. Closing the repo isn't always going to be an option. For example when you have to restore from a backup or are wiping a system to install a new system you may not be able to find all the repos and close them. I am working from backups in my example. fossil wouldn't let me open the repo. I haven't thought it through from a file integrity point of view but I'm looking for a way to do this given the repo is open and is in a new location. Also, by closing the repo, you will loose your stash and latest undo's (if you have some) -- Martin G. ___ 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 server' fails to chroot
Hello,
I saw this was fixed right after my mail (checkin [baa1ebb7d9]) -
verified it, works fine.
Thank you once again for the very quick response!
keep up the good work,
Michai
On Mon, Jan 7, 2013 at 3:58 PM, Michai Ramakers m.ramak...@gmail.com wrote:
Hello,
when I open ('fossil open') a repository located in the root ('/'),
where the current work dir is one below the root (say, '/mydir'),
'fossil server' results in an error message in my browser, when I view
'http://localhost:8080':
Status: 200 OK
X-Frame-Options: SAMEORIGIN
Cache-control: no-cache
Content-Type: text/html; charset=utf-8
Content-Length: 50
p class=generalErrorunable to chroot into /p
(I literally see this text in the browser window).
Environment:
$ fossil version
This is fossil version 1.25 [48798b2719] 2013-01-07 15:03:43 UTC
$ uname -a
NetBSD lime 6.0.1 NetBSD 6.0.1 (GENERIC) amd64
I tried with both static ('./configure --static make') and dynamic
binaries; both fail.
Dynamic binary works ok if I open the repository one dir further from
the root (i.e. '/foo/bar' instead of '/foo'), while repository is
still located in the root. (I didn't try with static binary anymore.)
Not urgent, but ran into this by accident.
With kind regards,
Michai Ramakers
___
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] Couple of newbie questions on artifacts and comparing
On Tue, 8 Jan 2013 13:38:06 +0100, Stephan Beal sgb...@googlemail.com wrote: 2012-11-25 [ad6f12df62] New version (user: Joe, artifact: [dc79071933], branch: trunk) 2012-11-25 [53ff5087e3] Original file (user: Joe, artifact: [54dff7fa29], branch: trunk) Correct. It's not immediately obvious, but the first number is the commit UUID and the second is the file artifact itself: zOut = sqlite3_mprintf( [%.10s] %s (user: %s, artifact: [%.10s], branch: %s), zCiUuid, zCom, zUser, zFileUuid, zBr); Thanks. If we must use the commit UUID when comparing different revisions of a file, In which case do we need the file artifact ID then? ___ 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] Couple of newbie questions on artifacts and comparing
On Tue, 8 Jan 2013 13:43:22 +0100, Stefan Bellon sbel...@sbellon.de wrote: Next I tried the first artifact ID: fossil gdiff --from 53ff5087e3 --to ad6f12df62 This works, but it seems to go through all the files that were part of each commit. fossil diff --from 53ff5087e3 --to ad6f12df62 myfile.c Thanks. I was under the wrong impression that the artifact ID was enough to identify a specific revision of a specific file. I would suggest adding the shortcuts to (g)diff: fossil gdiff last beforelast myfile.c Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] How to cancel file added through add?
Hello How do we cancel the result of add, ie. tell Fossil to *not* add such and such new file the next time the user runs fossil commit? I need to do this sometimes when I mistakenly used add to add a new file to the repository. delete/rm seem to tell Fossil to stop watching a file (and keep all the revisions in the repo): Remove one or more files or directories from the repository. I checked all the commands in fossil help dummy, but didn't find a command that looked like it did the trick. Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
* Gilles gilles.gana...@free.fr [2013-01-08 09:00 -0500]: How do we cancel the result of add, ie. tell Fossil to *not* add such and such new file the next time the user runs fossil commit? I just tried using `fossil rm` on a mistakenly added file (in an existing repository), and it does what you need. #v+ dave@fork-pooh:~/tmp/sast.fossil/css$ touch t dave@fork-pooh:~/tmp/sast.fossil/css$ fossil add t ADDED css/t dave@fork-pooh:~/tmp/sast.fossil/css$ fossil rm t DELETED css/t dave@fork-pooh:~/tmp/sast.fossil/css$ fossil status repository: /home/dave/FOSSIL/sast.fossil local-root: /home/dave/tmp/sast.fossil/ checkout: 97085a7c5b559ae5d0fa0514c276014e6fd8db52 2013-01-08 13:54:43 UTC parent: 2e8f22d3af1e698140537df0a1e33289f4e446b3 2013-01-08 03:07:22 UTC tags: trunk comment: Link reference to posts to posts. (user: dave) EDITED default.css #v- Regards, -- dave [ please don't CC me ] pgp8grszmc77K.pgp Description: PGP signature ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, 8 Jan 2013 09:21:10 -0500, David J. Weller-Fahy dave-lists-fossil-us...@weller-fahy.com wrote: I just tried using `fossil rm` on a mistakenly added file (in an existing repository), and it does what you need. Thanks for the info. So the online help is a bit wrong: Remove one or more files or directories from the repository. This command does NOT remove the files from disk. It just marks the files as no longer being part of the project. In other words, future changes to the named files will not be versioned. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Contributing to wiki?
Hello I'd like to contribute an article in the wiki, but even after logging as anonymous, I can't see any way to add a new page: http://www.fossil-scm.org/index.html/wcontent Are contributions limited to non-anonymous users? Thank you. ___ 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] Couple of newbie questions on artifacts and comparing
On Tue, Jan 8, 2013 at 2:02 PM, Gilles gilles.gana...@free.fr wrote: fossil gdiff last beforelast myfile.c A similar request has come up several times, and is certainly something we should consider (this would affect commands other than diff, e.g. checkout could also use this). i'd be up for programming it if we (==the list) can agree on syntax/semantics and we don't have to support all of the 3 million options supported by git (go up 2 revs, sideways 14, then down another 2). (That said, i'm probably exaggerating - i only briefly read about this feature in git.) -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Contributing to wiki?
On Tue, Jan 8, 2013 at 3:30 PM, Gilles gilles.gana...@free.fr wrote: I'd like to contribute an article in the wiki, but even after logging as anonymous, I can't see any way to add a new page: http://www.fossil-scm.org/index.html/wcontent Are contributions limited to non-anonymous users? The wiki in the main repo is not really maintained any longer - the project generally prefers the embedded docs approach because those docs partake in the whole versioning/branching mechanism whereas wiki pages are versioned but there is no UI for going to a specific version of a wiki page, and they don't participate in branching, For the time being, feel free to post patches against the files www/*.wiki here and one of the commiters can get them piped it. The easiest way to test local changes to those files is... edit the file you wish and then visit it by starting fossil server or fossil ui and use this URL: http://localhost:8080/doc/ckout/www/index.wiki note the path part ckout - that tells fossil to serve the local copy of that file from your hard drive. As you edit the file, just keep tapping F5 to reload the changes. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Contributing to wiki?
On Tue, 8 Jan 2013 15:40:25 +0100, Stephan Beal sgb...@googlemail.com wrote: The wiki in the main repo is not really maintained any longer - the project generally prefers the embedded docs approach because those docs partake in the whole versioning/branching mechanism whereas wiki pages are versioned but there is no UI for going to a specific version of a wiki page, and they don't participate in branching, For the time being, feel free to post patches against the files www/*.wiki here and one of the commiters can get them piped it. The easiest way to test local changes to those files is... edit the file you wish and then visit it by starting fossil server or fossil ui and use this URL: http://localhost:8080/doc/ckout/www/index.wiki note the path part ckout - that tells fossil to serve the local copy of that file from your hard drive. As you edit the file, just keep tapping F5 to reload the changes. Thanks. I guess that means I must create a new empty repository for the Fossil source code, synchronizing to fill it with the Fossil files, add a file in www, commit, and push the changes back to the official Fossil repository? ___ 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] Official approved way of moving a repo?
On Tue, Jan 8, 2013 at 1:55 PM, Martin Gagnon eme...@gmail.com wrote: I haven't thought it through from a file integrity point of view but I'm looking for a way to do this given the repo is open and is in a new location. Also, by closing the repo, you will loose your stash and latest undo's (if you have some) True enough. Here's an old thread on the topic which might be helpful. i didn't read all the way through it, but it seems to be the same question and a workaround: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06800.html Be aware: that thread refers to a file named _FOSSIL_. That file is now called .fslckout. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Couple of newbie questions on artifacts and comparing
On Tue, 08 Jan, Stephan Beal wrote: On Tue, Jan 8, 2013 at 2:02 PM, Gilles gilles.gana...@free.fr wrote: fossil gdiff last beforelast myfile.c A similar request has come up several times, and is certainly something we should consider (this would affect commands other than diff, e.g. checkout could also use this). i'd be up for programming it if we (==the list) can agree on syntax/semantics and we don't have to support all of the 3 million options supported by git (go up 2 revs, sideways 14, then down another 2). (That said, i'm probably exaggerating - i only briefly read about this feature in git.) Is subversion equally frowned upon? If not, what about: fossil diff --from PREV --to HEAD myfile.c In any case I think the --from and --to should be required and only symbolic names for the revision hashes should be introduced. The question is whether PREV and HEAD (and perhaps other symbolic names) should be bound to one branch (i.e. the one of the current checked out tree) or whether it should be global and possibly cross branches. Greetings, Stefan -- Stefan Bellon ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote: How do we cancel the result of add, ie. tell Fossil to *not* add such and such new file the next time the user runs fossil commit? fossil revert. Arguably, it is a bug that fossil rm doesn't work. Joerg ___ 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] Contributing to wiki?
On Tue, Jan 8, 2013 at 3:43 PM, Gilles gilles.gana...@free.fr wrote: Thanks. I guess that means I must create a new empty repository for the Fossil source code, synchronizing to fill it with the Fossil files, add a file in www, commit, and push the changes back to the official Fossil repository? Try: fossil clone http://fossil-scm.org fossil.fsl mkdir fossil cd fossil fossil open ../fossil.fsl editor_of_choice www/index.wiki fossil ui make some changes in index.wiki, tap F5 in the browser. When you're happy, do: [stephan@host:~/cvs/fossil/fossil]$ f diff --unified www/index.wiki --- www/index.wiki +++ www/index.wiki @@ -1,7 +1,8 @@ titleFossil/title +BLAH p align=center font size=3 iSimple, high-reliability, distributed software configuration management/i /font then paste that code here on the list (i think the list strips attachments) or send us a link to it. Before you can get commit access to the main repo you need to fill out a license waiver and snail-mail it to DRH. i don't have the link handy, but if you find yourself editing large amounts then we can fish out the waiver link for you. @DRH: please correct me if i'm wrong in assuming that documentation patches do not necessarily need the waiver? -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Official approved way of moving a repo?
On Tue, Jan 8, 2013 at 9:46 AM, Stephan Beal sgb...@googlemail.com wrote: Be aware: that thread refers to a file named _FOSSIL_. That file is now called .fslckout. ... on non-windows systems. On windows, the file is still called _FOSSIL_ because some windows systems have issues with filenames that begin with .. And _FOSSIL_ is recognized on all systems for backwards compatibility. There was another name used for this file at one point - but that other name turned out to be a mild profanity in Hungarian and hence was changed to .fslckout. That other name is still recognized for backwards compatibility but is never generated. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, 8 Jan 2013 15:50:10 +0100, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote: How do we cancel the result of add, ie. tell Fossil to *not* add such and such new file the next time the user runs fossil commit? fossil revert. Arguably, it is a bug that fossil rm doesn't work. Thanks but unless I'm mistaken, revert replaces the current files in the work directory with the corresponding last revision in the repo. I just want to tell Fossil to remove a file I added through add by mistake, so that it's no longer listed when I type fossil changes. ___ 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] Contributing to wiki?
On Tue, Jan 8, 2013 at 9:52 AM, Stephan Beal sgb...@googlemail.com wrote: @DRH: please correct me if i'm wrong in assuming that documentation patches do not necessarily need the waiver? The Contributor License Agreement (CLA) basically says: I recognize that Fossil uses the two-clause BSD license and I hereby release my changes/patches under that same license. It would be good to have a CLA online for documentation changes in addition to code changes, especially if the changes are large. But I am not nearly as strict about documentation as I am with code. Small documentation changes and/or typo fixes do not require a CLA. But we would appreciate a CLA from people who are doing major rewrites. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, Jan 08, 2013 at 03:55:05PM +0100, Gilles wrote: On Tue, 8 Jan 2013 15:50:10 +0100, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote: How do we cancel the result of add, ie. tell Fossil to *not* add such and such new file the next time the user runs fossil commit? fossil revert. Arguably, it is a bug that fossil rm doesn't work. Thanks but unless I'm mistaken, revert replaces the current files in the work directory with the corresponding last revision in the repo. I just want to tell Fossil to remove a file I added through add by mistake, so that it's no longer listed when I type fossil changes. fossil up foo fossil add bar Undo: fossil revert bar Joerg ___ 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] Official approved way of moving a repo?
On Tue, 08 Jan, Richard Hipp wrote: [...] On windows, the file is still called _FOSSIL_ because some windows systems have issues with filenames that begin with .. Is this really (still) the case? Subversion uses directories called .svn for years now. And the GnuWin32 toolchain uses files like .lesshst as well. It is true that you cannot create files and directories that start or end with a dot via the explorer, but it is possible via command line and via API functions. In fact, this fossil behaviour puzzles me a lot because I tend to share working copies via network share and at some point I end up having _FOSSIL_ and .fslckout which are not in sync. Perhaps having a configuration option to set the checkout filename would please all? Greetings, Stefan -- Stefan Bellon ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
* Gilles gilles.gana...@free.fr [2013-01-08 09:27 -0500]: On Tue, 8 Jan 2013 09:21:10 -0500, David J. Weller-Fahy dave-lists-fossil-us...@weller-fahy.com wrote: I just tried using `fossil rm` on a mistakenly added file (in an existing repository), and it does what you need. Thanks for the info. No worries, glad I could help! So the online help is a bit wrong: Remove one or more files or directories from the repository. This command does NOT remove the files from disk. It just marks the files as no longer being part of the project. In other words, future changes to the named files will not be versioned. There have been many messages thrown around recently about the `fossil rm` command (see the archives), but I would say the correctness of the documentation depends on your definition of repository. I think the author wrote using the definition of repository where it does not encompass the working set of files on disk (the checked out versions), but only those things stored within the actual fossil file where all artifacts are stored. Looked at from that perspective, the documentation is correct, although it could be more clear to those who come to the software without that perspective. Regards, -- dave [ please don't CC me ] pgpSYszSq9mLp.pgp Description: PGP signature ___ 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] Couple of newbie questions on artifacts and comparing
On Tue, Jan 8, 2013 at 9:49 AM, Stefan Bellon sbel...@sbellon.de wrote: Is subversion equally frowned upon? If not, what about: fossil diff --from PREV --to HEAD myfile.c Fossil already does this, with the exception that PREV is called prev or previous and HEAD is called current. fossil diff --from prev --to current myfile.c When you say --to current, that means use the version of the file that is checked in. If you omit the --to current, that means use the version of the file as editted in the check-out. In place of prev and current you can also use tip to mean the latest check-in. Or you can put the name of any branch, and that means the latest check-in on that branch. Or you can do things like branch:2012-09-16 to mean the latest checkin on branch on or before 2012-09-16 00:00:00. See http://www.fossil-scm.org/fossil/doc/trunk/www/checkin_names.wiki for additional information and for more examples. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Official approved way of moving a repo?
On Tue, Jan 8, 2013 at 4:08 PM, Stefan Bellon sbel...@sbellon.de wrote: In fact, this fossil behaviour puzzles me a lot because I tend to share working copies via network share and at some point I end up having _FOSSIL_ and .fslckout which are not in sync. Perhaps having a configuration option to set the checkout filename would please all? IN THEORY you could use this workaround: after opening from Windows, remove .fslckout. Your fossil binary on *nix will (i _think_) then see _FOSSIL_ and will (i think) use it. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Official approved way of moving a repo?
On Tue, Jan 8, 2013 at 10:08 AM, Stefan Bellon sbel...@sbellon.de wrote: In fact, this fossil behaviour puzzles me a lot because I tend to share working copies via network share and at some point I end up having _FOSSIL_ and .fslckout which are not in sync. Both windows and unix should look for both filenames. So you shouldn't ever run into a case where you end up with both (unless some of your machines are running a very old version of Fossil). If you have a test case that demonstrates otherwise, I'd sure like to see it. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Couple of newbie questions on artifacts and comparing
On Tue, Jan 08, 2013 at 03:56:15PM +0100, Stephan Beal wrote: On Tue, Jan 8, 2013 at 3:49 PM, Stefan Bellon sbel...@sbellon.de wrote: Is subversion equally frowned upon? If not, what about: fossil diff --from PREV --to HEAD myfile.c That would be too easy ;). Yes, it covers the most common case, but it would be much more interesting to be able to say go back N versions, as such a feature implies the prev behaviour as well. The question is whether PREV and HEAD (and perhaps other symbolic names) should be bound to one branch (i.e. the one of the current checked out tree) or whether it should be global and possibly cross branches. That's a good point. My gut feeling is that the currently-checked-out branch should be used, defaulting to trunk if there is no checkout (that said, i think we once had a thread where the user had removed or renamed his trunk branch to something else). Or maybe a syntax like branch_name:symbolic_name (which of course only works as long as nobody uses ':' in their branch names). Actually, the prev keyword already does something.. Example: $ fossil diff --from prev will give you diff between current checkout from previous version on repository. or $ fossil diff --from prev myfile.c Here, prev mean previous version globally, not previous version of the specified file... This is not on the help, but I found this on the source.. http://fossil-scm.org/index.html/artifact/ab3b8161d773d9619a709c92ef33b799cc473a74?ln=49-72 -- Martin G. ___ 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] Couple of newbie questions on artifacts and comparing
On Tue, 08 Jan, Stephan Beal wrote: On Tue, Jan 8, 2013 at 3:49 PM, Stefan Bellon sbel...@sbellon.de wrote: Is subversion equally frowned upon? If not, what about: fossil diff --from PREV --to HEAD myfile.c That would be too easy ;). Yes, it covers the most common case, but it would be much more interesting to be able to say go back N versions, as such a feature implies the prev behaviour as well. fossil diff --from -5 --to -3 myfile.c it is, then. ;-) -0 (or 0) being the current and positive (non-zero) values making no sense (except when being run from inside the time machine shell). The question is whether PREV and HEAD (and perhaps other symbolic names) should be bound to one branch (i.e. the one of the current checked out tree) or whether it should be global and possibly cross branches. That's a good point. My gut feeling is that the currently-checked-out branch should be used, defaulting to trunk if there is no checkout (that said, i think we once had a thread where the user had removed or renamed his trunk branch to something else). Or maybe a syntax like branch_name:symbolic_name (which of course only works as long as nobody uses ':' in their branch names). No need for a new syntax (and a very non-fossil one), I think. fossil diff already has the option --branch. Currently it is mutually exclusive with --from and --to (because the revision hashes already specify the branch), but that could be used to specify another branch than the current one when using --from and --to with symbolic (or commit-relative) names. Greetings, Stefan -- Stefan Bellon ___ 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] Contributing to wiki?
On Tue, 8 Jan 2013 15:52:59 +0100, Stephan Beal sgb...@googlemail.com wrote: then paste that code here on the list (i think the list strips attachments) or send us a link to it. Before you can get commit access to the main repo you need to fill out a license waiver and snail-mail it to DRH. i don't have the link handy, but if you find yourself editing large amounts then we can fish out the waiver link for you. Thanks for the tutorial. Here's the changes made to index.wiki: www.pastebin.com/raw.php?i=x5X8gFFY And the little page I wrote in HTML: www.pastebin.com/raw.php?i=cTpqLd0g ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, 8 Jan 2013 16:06:30 +0100, Joerg Sonnenberger jo...@britannica.bec.de wrote: I just want to tell Fossil to remove a file I added through add by mistake, so that it's no longer listed when I type fossil changes. fossil up foo fossil add bar Undo: fossil revert bar Thank you. ___ 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] Contributing to wiki?
On Tue, Jan 8, 2013 at 4:21 PM, Gilles gilles.gana...@free.fr wrote: Here's the changes made to index.wiki: www.pastebin.com/raw.php?i=x5X8gFFY And the little page I wrote in HTML: www.pastebin.com/raw.php?i=cTpqLd0g That seems to (in spirit, at least) duplicate the Quickstart page: http://fossil-scm.org/index.html/doc/trunk/www/quickstart.wiki :-? One comment/FYI for future reference: the title tag won't work properly here because Fossil wraps up the wiki content in the body of the page, whereas the title tag belongs in the header. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] How to cancel file added through add?
On Tue, 8 Jan 2013 10:12:27 -0500, David J. Weller-Fahy dave-lists-fossil-us...@weller-fahy.com There have been many messages thrown around recently about the `fossil Looked at from that perspective, the documentation is correct, although it could be more clear to those who come to the software without that perspective. Makes sense. In any case, it's always a bit involved to make the distinction between the checked out version of a file (in the current work directory) and the different versions available in the repository. Personally, I would have used fossil cancel myfile.c just to tell Fossil to ignore this file that was added with, well, add. ___ 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] Official approved way of moving a repo?
On Tue, 08 Jan, Richard Hipp wrote: Both windows and unix should look for both filenames. So you shouldn't ever run into a case where you end up with both (unless some of your machines are running a very old version of Fossil). If you have a test case that demonstrates otherwise, I'd sure like to see it. Ok, I'll see whether I can reproduce it again. Now, quick tests with both 1.24 indeed did not exhibit the behaviour. Perhaps I was still running 1.23 on one of the machines at that time. I'll keep an eye on it. Greetings, Stefan -- Stefan Bellon ___ 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] Contributing to wiki?
On Tue, 08 Jan 2013 16:21:33 +0100, Gilles gilles.gana...@free.fr wrote: And the little page I wrote in HTML: www.pastebin.com/raw.php?i=cTpqLd0g One typo: Check current status ... This shows the list of changes that have been done and will be commited the next time you run fossil commit. It's a useful command to run before running fossil commit just to check that things are OK BEFOR proceeding. and one mistake: Cancel changes and go back to prevision revision ... For security, since the work file hasn't been checked in, Fossil will prompt you to confirm that you do wish to replace the file. - Fossil doesn't prompt when reverting a file. It simply reminds the user of the undo command, just in case it was a mistake. ___ 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] Contributing to wiki?
On Tue, 8 Jan 2013 16:29:44 +0100, Stephan Beal sgb...@googlemail.com wrote: That seems to (in spirit, at least) duplicate the Quickstart page: http://fossil-scm.org/index.html/doc/trunk/www/quickstart.wiki The problem I had with the Quick Start is: - it includes commands that are useless/confusing when using Fossil just as a single user (cloning, importing, push/pull, branching/merging, server, etc.) - it doesn't include commands I found useful or didn't provide enough infos (eg. what rm really does, how to compare two revisions of a file, etc.) But it's OK if the Quick Guide is considered good enough. No biggie. One comment/FYI for future reference: the title tag won't work properly here because Fossil wraps up the wiki content in the body of the page, whereas the title tag belongs in the header. Good to know. Thank you. ___ 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] Contributing to wiki?
On Tue, Jan 8, 2013 at 10:21 AM, Gilles gilles.gana...@free.fr wrote: And the little page I wrote in HTML: www.pastebin.com/raw.php?i=cTpqLd0g http://www.fossil-scm.org/fossil/doc/trunk/www/fiveminutes.wiki -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Contributing to wiki?
On Tue, Jan 8, 2013 at 4:47 PM, Richard Hipp d...@sqlite.org wrote: On Tue, Jan 8, 2013 at 10:21 AM, Gilles gilles.gana...@free.fr wrote: And the little page I wrote in HTML: www.pastebin.com/raw.php?i=cTpqLd0g http://www.fossil-scm.org/fossil/doc/trunk/www/fiveminutes.wiki It seems i was wrong about the TITLE tag being completely ignored - the wiki uses that as the title. @Gilles: i'll get your last changes into that file in a few minutes. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Contributing to wiki?
On Tue, 8 Jan 2013 16:54:54 +0100, Stephan Beal sgb...@googlemail.com wrote: http://www.fossil-scm.org/fossil/doc/trunk/www/fiveminutes.wiki It seems i was wrong about the TITLE tag being completely ignored - the wiki uses that as the title. @Gilles: i'll get your last changes into that file in a few minutes. Thank you. ___ 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] Contributing to wiki?
On Tue, 8 Jan 2013 16:54:54 +0100, Stephan Beal sgb...@googlemail.com wrote: @Gilles: i'll get your last changes into that file in a few minutes. Oops, I forgot to show the command for Commit changes: fossil commit -m Added stuff ___ 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] Contributing to wiki?
On Tue, Jan 8, 2013 at 5:27 PM, Gilles gilles.gana...@free.fr wrote: On Tue, 8 Jan 2013 16:54:54 +0100, Stephan Beal sgb...@googlemail.com wrote: @Gilles: i'll get your last changes into that file in a few minutes. Oops, I forgot to show the command for Commit changes: fossil commit -m Added stuff Fixed: http://fossil-scm.org/index.html/info/0fb6c829f2 -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Contributing to wiki?
On Tue, 8 Jan 2013 17:56:36 +0100, Stephan Beal sgb...@googlemail.com wrote: Oops, I forgot to show the command for Commit changes: fossil commit -m Added stuff Fixed: http://fossil-scm.org/index.html/info/0fb6c829f2 Thanks Stephan. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
