[fossil-users] Move and merge: please explain

2011-05-05 Thread tehqux
Hello. Can someone help me? There is a branch and I want to rename a file (from FOO to BAR for example), add a new file FOO and then merge changes into trunk. What is the right way to do this? A naive way (fossil merge branchname from the trunk) didn't work (ticket 7e0e4755c6). And what is the

[fossil-users] find artifacts related to wiki pages

2011-05-05 Thread Felix Wolfheimer
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.

Re: [fossil-users] Move and merge: please explain

2011-05-05 Thread Tomek Kott
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

[fossil-users] Problems with annotate

2011-05-05 Thread Lluís Batlle i Rossell
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

Re: [fossil-users] find artifacts related to wiki pages

2011-05-05 Thread Ron Wilson
On Thu, May 5, 2011 at 4:21 AM, Felix Wolfheimer f.wolfhei...@googlemail.com 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

Re: [fossil-users] Fossil for Android?

2011-05-05 Thread Aurel
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

Re: [fossil-users] Fossil for Android?

2011-05-05 Thread Stephan Beal
On Thu, May 5, 2011 at 11:37 PM, Aurel kerusursa...@gmail.com 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

Re: [fossil-users] Fossil for Android?

2011-05-05 Thread Aurel
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 sgb...@googlemail.com a écrit : On Thu, May 5, 2011 at 11:37 PM, Aurel kerusursa...@gmail.com wrote: * copied it in the /system/xbin of my phone (yes my

Re: [fossil-users] manifest file (3967) is malformed error

2011-05-05 Thread Richard Hipp
On Thu, May 5, 2011 at 8:41 PM, Graeme Gill grae...@argyllcms.com 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: