[fossil-users] newbie question - no answer in the wiki
Hello there, Sorry for the newbie question but I have lived without scm all my life and am just getting into fossil, as I am about to become a part of a larger development project. bjorn@box:~/Desktop/fossil-test$ fossil checkout testrepo fossil: there are unsaved changes in the current checkout bjorn@box:~/Desktop/fossil-test$ fossil commit fossil: missing file: dyr.jpg fossil: aborting due to prior errors Can somebody translate this error message into a solution? Cheers, BM ___ 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 question - no answer in the wiki
On Fri, Feb 17, 2012 at 11:51 AM, Bjorn Madsen bjorn.mad...@operationsresearchgroup.com wrote: bjorn@box:~/Desktop/fossil-test$ fossil checkout testrepo fossil: there are unsaved changes in the current checkout bjorn@box:~/Desktop/fossil-test$ fossil commit fossil: missing file: dyr.jpg fossil: aborting due to prior errors Can somebody translate this error message into a solution? 'fossil status' will probably show you that dyr.jpg is missing - it was added to the repo at some point but the local copy is not there. You can get back the most recent copy (assuming it was ever checked in before) with: fossil revert dyr.jpg If it was never checked in before then you'll need to create/recover dyr.jpg (or fossil rm dyr.jpg, i think) before committing. i hope that helps, -- - 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] newbie question - no answer in the wiki
Excellent - thank you! On 17 February 2012 11:22, Richard Hipp d...@sqlite.org wrote: On Fri, Feb 17, 2012 at 5:51 AM, Bjorn Madsen bjorn.mad...@operationsresearchgroup.com wrote: Hello there, Sorry for the newbie question but I have lived without scm all my life and am just getting into fossil, as I am about to become a part of a larger development project. bjorn@box:~/Desktop/fossil-test$ fossil checkout testrepo fossil: there are unsaved changes in the current checkout bjorn@box:~/Desktop/fossil-test$ fossil commit fossil: missing file: dyr.jpg fossil: aborting due to prior errors Can somebody translate this error message into a solution? You have done fossil add dyr.jpg at some point, but no file named dyr.jpg exists in your checkout. Either create the file, or do fossil rm dyr.jpg before you commit. Cheers, BM ___ 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 -- Bjorn Madsen *Researcher Complex Systems Research* Ph.: (+44) 0 7792 030 720 Ph.2: (+44) 0 1767 220 828 bjorn.mad...@operationsresearchgroup.com ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] fsl wrapper script, might be of use to others ...
I have written a wrapper script for fossil that makes some minor adaptions to accommodate a somewhat more Unix centric use model and where a large number of repos must be dealt with. In the off chance that others may find it useful I'm making it available at: http://chiselapp.com/user/kiatoa/repository/fsl This is an initial release with almost no documentation and it probably has bugs so if you try it keep backups! I am interested in feedback or ideas related to the script. Matt -=- ___ 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] compile with --enable-json
On 16-02-2012 23:45, Stephan Beal wrote: On Thu, Feb 16, 2012 at 11:19 PM, Johan Samyn johan.sa...@gmail.com mailto:johan.sa...@gmail.com wrote: Thanks Stephan. Should adding 'FOSSIL_ENABLE_JSON = 1' to my Makefile.mingw work too (I'm a makefile noob ...) ? It doesn't look like that's a known makefile option (it might be worth adding, though): stephan@tiny ~/cvs/fossil/fossil $ grep FOSSIL_ENABLE_JSON win/Makefile.* stephan@tiny ~/cvs/fossil/fossil $ but what you can do is add this line to your makefile: CPPFLAGS += -DFOSSIL_ENABLE_JSON (instead of CFLAGS like i said earlier) No compilation rejection anymore, but 'fossil json ...' still does not work. What does it say? Trying 'fossil json wiki get Opera' (as the example in the other thread shows) (on the fossil repo itself) says: snip C:\DEV\FOSSIL\fossil-dev\work\fossil.exe: work\fossil.exe: unknown command: json work\fossil.exe: use help for more information /snip Are you sure you're running the newly-compiled binary and not your old/installed one? Yeah, Stephan, 100% sure. Did you do a 'make clean' before trying it (if you don't, it won't really rebuild anything). I did even that. Need some external json lib to link with maybe ? I didn't find anything about json in the Fossil compilation docs. That's probably because those doing the documenting live on Unix-like platforms where './configure --help' works ;). -- - 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 -- Johan Samyn ___ Perfection is achieved, not when there is nothing more to add, but when there is nothing left to take away. - A. de Saint-Exupery ___ 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] compile with --enable-json
On Fri, Feb 17, 2012 at 8:27 PM, Johan Samyn johan.sa...@gmail.com wrote: On 16-02-2012 23:45, Stephan Beal wrote: C:\DEV\FOSSIL\fossil-dev\work\fossil.exe: work\fossil.exe: unknown command: json work\fossil.exe: use help for more information That's what happens if FOSSIL_ENABLE_JSON is not defined when it's built. Can you try: # make clean # make CPPFLAGS=-DFOSSIL_ENABLE_JSON And paste some of the output from that (a few compiler lines only, not the rest of the stuff). They should look something like: cc -DFOSSIL_ENABLE_JSON-g -O2 -DHAVE_AUTOCONFIG_H -I. -I./src -Ibld -o bld/json.o -c bld/json_.c If the -DFOSSIL_ENABLE_JSON part is not there then something is unexpected in your makefile, but i can't say for certain what. If -DFOSSIL_ENABLE_JSON _is_ there and 'fossil json' says unknown command then something else is wrong. i unfortunately cannot test the mingw makefile myself. -- - 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] compile with --enable-json
On Fri, Feb 17, 2012 at 8:34 PM, Stephan Beal sgb...@googlemail.com wrote: # make CPPFLAGS=-DFOSSIL_ENABLE_JSON Nevermind - that doesn't work. i thought it worked because i failed to do 'make distclean' before re-trying. i've just added an option to the mingw makefile which should allow you to do: FOSSIL_ENABLE_JSON=1 make -f win/Makefile.mingw Please do an update, make clean, and give that a try. :-? -- - 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] compile with --enable-json
On 17-02-2012 20:46, Stephan Beal wrote: On Fri, Feb 17, 2012 at 8:34 PM, Stephan Beal sgb...@googlemail.com mailto:sgb...@googlemail.com wrote: # make CPPFLAGS=-DFOSSIL_ENABLE_JSON Nevermind - that doesn't work. i thought it worked because i failed to do 'make distclean' before re-trying. i've just added an option to the mingw makefile which should allow you to do: FOSSIL_ENABLE_JSON=1 make -f win/Makefile.mingw Please do an update, make clean, and give that a try. Neat, that did the trick! Thanks Stephan. And I can achieve the same by simple adding 'FOSSIL_ENABLE_JSON = 1' somewhere in the beginning of the Makefile.mingw (at least before the part you added). Then I don't have to type that option each time I compile. The problem (or one of them) very probably was that I deleted the /wbld folder (as 'make clean' does not work), but I did not delete the previous fossil.exe file (as is done by a 'make clean' I guess). I discovered that by doing a 'fossil version', which gave me '... 1.22 [6c835ea8c7] ...', which was not the latest changeset you committed, and I updated to. (Btw: the commentline above the 'ifdef FOSSIL_ENABLE_JSON ...' part you added in the Makefile.mingw will have to be edited, as it still refers to where you copied it from.) :-? -- - 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 -- Johan Samyn ___ Perfection is achieved, not when there is nothing more to add, but when there is nothing left to take away. - A. de Saint-Exupery ___ 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] compile with --enable-json
On Fri, Feb 17, 2012 at 9:46 PM, Johan Samyn johan.sa...@gmail.com wrote: On 17-02-2012 20:46, Stephan Beal wrote: (Btw: the commentline above the 'ifdef FOSSIL_ENABLE_JSON ...' part you added in the Makefile.mingw will have to be edited, as it still refers to where you copied it from.) Fixed now - thanks :). -- - 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] Building fossil on Solaris
On 02/17/12 03:00, Steve Bennett wrote: [---] No problem. I've pushed the fix into autosetup and updated autosetup on a branch, so perhaps Richard will merge this fix at some point. I've encountered two other issues; one is fixed in the branch jan-buildfixes. After applying the lib-fix, the linker complains; it can not find dlsym, dladdr, dlopen, socket, connect, dlclose, dlerror and shutdown. config.log indicates that it's linking conftest__ with: -lssl -lcrypto ..while my old (manually patched) fossil Makefile contains: -lssl -lcrypto -ldl -lsocket -lnsl I, naively, tried inserting something along the line of if a host *sun4* match is found, then append '-ldl -lsocket -lnsl' to LIBS, but it made no difference. I don't know if I don't understand the build system or Tcl. (I removed the if, and simply told it to always add those extra libraries to LIBS, but it didn't, so I assume it's the build system I don't understand). Any help is appreciated. -- Kind regards, Jan Danielsson ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Functionality I want since long, in a branch apart
Hello, I decided to update one of the branches I had with changes not accepted into trunk to some features I've been wanting in fossil since a long time. Of course, it's possible since there is the cool 'vdiff' page with SBS diff. At [9f208c6830] there are: - a 'd' link in annotate web pages, that point to the checkin that brought the line in. - a new setting to choose to have target in anchor hrefs or not in the ui. I personally dislike a lot the target windows in href anchors. - a new way of naming the last checkin of the *parent branch*, with a *pbranch:* prefix. As in: pbranch:annotate_links. This will save me from typing lots of test-find-pivot and copy-paste of uuids. - A new link at the info page, on Other Links, that points to the vdiff since the last checkin of parent branch. Of course I'd like such functionality in trunk, even if it is in some other shape. But as I could not make anyone either accept those kind of changes I wrote, or get someone to write them for me, here is all in a 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
