Re: [fossil-users] manifest file (3967) is malformed error
On Thu, May 5, 2011 at 8:41 PM, Graeme Gill wrote: > Hi, >I've been using fossil happily for a few weeks, but suddenly have a > problem. > After renaming a couple of files, I can't do a commit anymore: > > fossil commit afiles > vim "ci-comment-D69892D388C2.txt" > New_Version: abfcdd99b08f7f0aa3fa20e55656a732ca9d754e > fossil.exe: manifest file (3967) is malformed > > and fossil diff shows that the file wasn't committed. > > Questions: > > 1) What caused this ? > > 2) How do I fix it ? > I dunno. Can you send me the repository so that I can investigate? > > thanks, > Graeme Gill. > ___ > 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] manifest file (3967) is malformed error
Hi, I've been using fossil happily for a few weeks, but suddenly have a problem. After renaming a couple of files, I can't do a commit anymore: fossil commit afiles vim "ci-comment-D69892D388C2.txt" New_Version: abfcdd99b08f7f0aa3fa20e55656a732ca9d754e fossil.exe: manifest file (3967) is malformed and fossil diff shows that the file wasn't committed. Questions: 1) What caused this ? 2) How do I fix it ? thanks, Graeme Gill. ___ 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 for Android?
My bad, fossil server repo.fsl is working on my phone. I forgot to give the repo to the command :) Aurélien Le 2011-05-05 17:54, "Stephan Beal" a écrit : > On Thu, May 5, 2011 at 11:37 PM, Aurel wrote: > >> * copied it in the /system/xbin of my phone (yes my phone :) ) >> > > For what it's worth, i think it would be _exceedingly_ cool (in a geeky way) > to see a fossil server run on a telephone. > > Could we hack it to make the phone vibrate or beep when someone makes a > commit? ;) > > -- > - stephan beal > http://wanderinghorse.net/home/stephan/ ___ 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 for Android?
On Thu, May 5, 2011 at 11:37 PM, Aurel wrote: > * copied it in the /system/xbin of my phone (yes my phone :) ) > For what it's worth, i think it would be _exceedingly_ cool (in a geeky way) to see a fossil server run on a telephone. Could we hack it to make the phone vibrate or beep when someone makes a commit? ;) -- - stephan beal http://wanderinghorse.net/home/stephan/ ___ 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 for Android?
Hi, Sorry if I sent this twice... Following Mike Meyer directions I was able to compile fossil for android 2.2, but had the same problem as him: nothing else than 'fossil help' Here is what I did to make it work: * downloaded the NDK and following android-ndk-r5b/documentation.html did $NDK/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=/tmp/my-android-toolchain export PATH=/tmp/my-android-toolchain/bin:$PATH export CC=arm-linux-androideabi-gcc * used Mike Meyer's Makefile but changed the following ( 4/ ABI Compatibility section of the NDK documentation ) NDK = /home/user1/Projets-new/andfossil/android-ndk-r5b GCC = arm-linux-androideabi-gcc # sqlite had problems compiling, but reading from an old post on the sqlite mailing found the -Dfdatasync=fsync option TCC = $(GCC) -I$(NDK)/platforms/android-5/arch-arm/usr/include -Dfdatasync=fsync LDFLAGS=-Wl,--fix-cortex-a8 -dynamic-linker=/system/bin/linker -L$(NDK)/platforms/android-5/arch-arm/usr/lib -L$(NDK)/toolchains/arm-eabi-4.4.0/prebuilt/linux-x86/lib/gcc/arm-eabi/4.4.0 * then make clean; make * copied it in the /system/xbin of my phone (yes my phone :) ) * added en entry for my server in /etc/host ( from the shell my phone does not resolve names ...) * cloned succesfully using fossil clone http://myserver/myrepo myrepo.fsl I still have a pb using fossil server, but I think it is just a matter of rights. Also there is still the I18N and getpass workaround from Mike Meyer. I'm going to try to make it without modifying fossil's sources. Thanks for fossil :) Aurélien. ___ 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] find artifacts related to wiki pages
On Thu, May 5, 2011 at 4:21 AM, Felix Wolfheimer wrote: > Is there a simpler way to find the artifact > number of a wiki page using the fossil web interface? There could be multiple artifact IDs for a wiki page as Fossil tracks changes to wiki pages like it would commits toa file, so you would have to find all of the AIDs for the wiki page to be shunned. I had thought that you could eventualy get the AID of a wiki page through the page's history. Clicking on a commit ID in the page history shows a commit descriptor along with the content of the page as of that commit. Clicking on the Raw Text link on this description page shows the raw text of the descriptor. In this, I was able to various AIDs, including the CID of the parent. There was also an AID as the value of a Z keyword. When I tried to use that AID to fetch the corresponding artifact (http://127.0.0.1:8080/artifact/3a6d324a3373793c576b48e04404448d), I got my repository's home page, instead. There was no error message, thos I suppose this could mean the artifact was not found? I tried this with other "Z" tagged AIDs from other versions of both the same wiki page and other wiki pages. Same result. Maybe the AIDs from the page history listing are what you need. I have not tried using them for shunning a wiki page. ___ 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] Move and merge: please explain
> > > > Only file content is merged. The result continues to use the > > file and directory names from the current checkout even if those > > names might have been changed in the branch being merged in. > > Fossil definitely renames files if they were renamed in branch. It > works perfectly when there are no such conflicts as above. > ___ > That one confuses me too as a new user. My thought would be that if the branch renamed the file, that is a change to the file that should be merged in. I would also like to hear an explanation from a fossil super-user. Tomek ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] find artifacts related to wiki pages
I played around with the wiki feature of fossil and inserted some wiki pages which I wanted to delete afterwards. Digging through the forum told me that I need to shun the wiki pages I would like to delete using their artifact number as there is currently no simple command to delete a wiki page. I tried to find this artifact number somewhere in the web interface of fossil but was unable to find them there. Even on the commandline I just found the possibility to display the names of my wiki pages but not their artifact number. In the end I exported the whole repo using "fossil deconstruct" and digged through all artifacts using grep -R searching for the text in the wiki pages I want to delete. I could find the artifact number this way and then shun them from the repo but I wonder if this is the proposed workflow for deleting wiki pages. Is there a simpler way to find the artifact number of a wiki page using the fossil web interface? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users