Re: [fossil-users] Chiselapp question
It worked. I did have problem as the project code came back as: project-code|5f509f990b361984473c2aedd087a61e0e8dc0f3|1448549878 and I had to trim off the part after the |. If I asked as fossil info -R LPC1114-PWM.fossil project-name: project-code: 5f509f990b361984473c2aedd087a61e0e8dc0f3 checkins: 1 i got it less the extra stuff. I set that project-code in my current repo, got the remote path OK and it synched OK. The only thing I then had to do then was log in to the Chiselapp version and do admin->config to match my local version (i.e.Project Name & description) then the home page of the original appeared. Thank you very much for the help. jim schimpf > On 26 Nov, 2015, at 14:08, Andy Bradford > wrote: > > Thus said jim Schimpf on Thu, 26 Nov 2015 10:45:34 -0500: > >> Also since that worked is there some way a I can move the local repo I >> have of this project (and it's history) into this newly cloned repo. >> Then when I sync that with Chiselapp it will have done the push >> equivalent. > > Just make sure that the project code is the same as the project code in > Chiselapp: > > $ fossil sql -R local.fossil > SQLite version 3.9.2 2015-11-02 18:31:45 > Enter ".help" for usage hints. > sqlite> SELECT * FROM config WHERE name = 'project-code'; > project-code|d05af28ff53c2077795d6780192daca8006202e6|1448563931 > sqlite> UPDATE config SET value = '' WHERE name = 'project-code'; > > Then, open the repository, use ``fossil remote'' to set your sync URL > to: > > https://jschi...@chiselapp.com/user/jschimpf/repository/LPC1114-PWM > > Then run ``fossil sync'' > > Andy > -- > TAI64 timestamp: 4000565758e3 > > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Chiselapp question
Hi, I’m a ChiselApp user and have a number repos there. Today I created a new repo and am attempting to push my existing repo there I keep getting login failures. (using the same command that worked on previous repos) 500 FOSSIL> fossil push https://jschi...@chiselapp.com/user/jschimpf/repository/LPC1114-PWM -R LPC1114-PWM.fossil --once password for jschimpf: Round-trips: 1 Artifacts sent: 33 received: 0 Error: login failed missing or incorrect password for user “jschimpf" The password is correct as I have I logged into chiselapp in my browser with the same PW. (1) Am I seeing a version mismatch with my version of (1.27) and Chiselapp running 1.25 ? (2) Then I found I can clone the at present MT repo with fossil clone https://jschi...@chiselapp.com/user/jschimpf/repository/LPC1114-PWM LPC1114-PWM.fossil and it takes the password it rejected in the push. Also since that worked is there some way a I can move the local repo I have of this project (and it’s history) into this newly cloned repo. Then when I sync that with Chiselapp it will have done the push equivalent. Thanks very much for the help. —jim schimpf ___ 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] NOT_A_FILE problem
Thank you that worked. So if I have one of these files turned into directory or vice-versa events. The solution is to remove the offending item. (fossil rm..) then commit that, add it back in and then commit again. Makes sense and your explanation is the mechanism of what is going on. —jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] NOT_A_FILE problem
Hi,
This is on OS X so bear with me. I have repository and in there is an
OmmnuGraffle image (like Visio). Originally it was a single file but then I
added a png image to the picture. On OS X it still looks like a single file
but now it becomes a directory. When I did this and tried to commit I got:
not an ordinary file: /Users/jschimpf/Public/HayJam/Docs/images/Detector.graffle
abort due to prior errors
Doing a status I got:
504 HayJam> fossil status
repository: /Users/jschimpf/Public/HayJam/../FOSSIL/HayJam.fossil
local-root: /Users/jschimpf/Public/HayJam/
config-db:/Users/jim/.fossil
checkout: d7568dfc3e5510b1f89c75ffd233329cba29ad76 2015-06-05 08:44:01 UTC
parent: 6f67a2bb3b8313f70d044b3b2eaf2cd74f5fedfb 2015-06-05 07:25:10 UTC
tags: trunk
comment: Update sensor schematic with values (user: jim)
EDITED Docs/HayJam.pdf
NOT_A_FILE Docs/images/Detector.graffle
EDITED Docs/images/Detector.png
So I then did a fossil rm of this file and did an OS rm and removed if from the
directory.
put it back in the directory and fossil added it to the repository again.
Trying commit again I got the same problem. The status shows it’s added as a
directory so I don’t see why this failed
fossil status
EDITED ../HayJam.pdf
DELETEDDetector.graffle
ADDED Detector.graffle/data.plist
ADDED Detector.graffle/image1.png
EDITED Detector.png
Any suggestions what to try:
1) Delete it, commit then re-add with new name
2) Delete it,commit then re-add with same name
Oh yes:
This is fossil version 1.27 [13ad130920] 2013-09-11 11:43:49 UTC
Thanks very much for the help.
—jim schimpf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Book update (Chiselapp)
Hi, I finally got enough time in a row to work through the tickets on the Fossil book http://www.fossil-scm.org/schimpf-book/doc/2ndEdition/fossilbook.pdf and added a chapter on Chiselapp the Fossil hosting site. I have a how to do it chapter and would appreciate any corrections or better ways of doing it. Thanks and special thanks to the maintainers of Chiselapp. --jim schimpf___ 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-users Digest, Vol 65, Issue 42
Help for new users: http://www.fossil-scm.org/schimpf-book/index tooting my own horn... and others who contributed. --jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Question about Source forge Fossil hosting
Hi,
I have used Chiselapp for hosting some Fossil project but just got a
note that he is shutting down May first. So I decided to try the source forge
version (http://fossilrepos.sourceforge.net/) . Very easy to create a project
but my previous experience with Chisel seems to not to apply as I was trying to
push the repository there it just didn't work. Has anyone else had success
with this ?
--jim schimpf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Help with Chisel
Hi, I am attempting to use the free Fossil hosting at chiselapp.com. You can load repository's there and they do effectively a CGI host. Works very well and thanks and props to James for hosting the site. There are some limits if you want to upload your repository is must < 8 meg and if you want to clone it, also it cannot be too large as the web page times out. I have a 64Meg repository that I want on there, to do that you have to "fossil push" it there. You create a repository (using the Chisel web page) and get the project-code from your local version (fossil info -R ) and put that in the create so you can log in for the push. Also you want to set the password just so you know it. Next you push to the site with: https://jschimpf:@chiselapp.com/user/jschimpf/repository/Firenet and then wait. When done you can go the the above URL and login into your site. You must also set up the site so it has the same Initial wiki page name as the original. Then your wiki will show up on the pushed site. After doing this I have my wiki, ticket and time line but I don't see any of the files. I have also tried this locally doing a push on my local machine I have the same problem. All the other stuff is there but no files. The repository is as large as the original so the files are there but aren't accessible in the pushed version. Doing a fossil open on the pushed repository works but no files in the new location. What vital thing did I miss ? Thanks for the help --jim schimpf ___ 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 hosting
Hi, Just found http://chiselapp.com/ which is a Fossil free hosting service. There are a number of repositories there now but most are experiments. Anyway you can create an account and try it out. --jim ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Recursive deletes ?
Hi,
I'm trying to tidy up a build directory after I mistakenly added a
bunch of temp build files. So I did:
699 terms-win> fossil rm build
DELETED build/Debug/terms-win
DELETED build/terms-win.build/Debug/terms-win.build/build-state.dat
DELETED build/terms-win.build/Debug/terms-win.build/build-state~.dat
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/bsdserial.o
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/my_kbhit.o
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/my_serial.o
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/netcom.o
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/terms-win.LinkFileList
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/terms.o
DELETED
build/terms-win.build/Debug/terms-win.build/Objects-normal/x86_64/tinythread.o
DELETED
build/terms-win.build/Debug/terms-win.build/terms-win-all-target-headers.hmap
DELETED
build/terms-win.build/Debug/terms-win.build/terms-win-generated-files.hmap
DELETED
build/terms-win.build/Debug/terms-win.build/terms-win-own-target-headers.hmap
DELETED
build/terms-win.build/Debug/terms-win.build/terms-win-project-headers.hmap
DELETED build/terms-win.build/Debug/terms-win.build/terms-win.dep
DELETED build/terms-win.build/Debug/terms-win.build/terms-win.hmap
DELETED build/terms-win.build/Debug/terms-win.build/terms-win~.dep
DELETED build/terms-win.build/terms-win.pbxindex/categories.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/cdecls.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/decls.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/files.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/imports.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/pbxindex.header
DELETED build/terms-win.build/terms-win.pbxindex/protocols.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/refs.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/strings.pbxstrings/control
DELETED build/terms-win.build/terms-win.pbxindex/strings.pbxstrings/strings
DELETED build/terms-win.build/terms-win.pbxindex/subclasses.pbxbtree
DELETED build/terms-win.build/terms-win.pbxindex/symbols0.pbxsymbols
700 terms-win> fossil status
repository: /Users/jschimpf/Public/FOSSIL/USBSW2.fossil
local-root: /Users/jschimpf/Public/USBSW2/
server-code: 1cddb23bd5084e9aef5b4cb8943f5c02f844e32b
checkout: 405b036b4a33b33e6cce52fcb4dcf8adf48526b0 2010-09-09 17:18:12 UTC
parent: 420342ea51214a962a8596c071f3260747a15c83 2010-09-09 16:58:27 UTC
tags: trunk
701 terms-win>
As you see when I run the status nothing shows as deleted, also if I do a
checkin in this state the files are still there. The fossil I used is:
This is fossil version [4980b9a796] 2010-09-09 13:57:50 UTC
I had the same problem with an older version so got the latest and
greatest with the same result.
--jim schimpf
___
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-users Digest, Vol 30, Issue 4
Builds fine out of the box in various versions of OS X. (10.5 and 10.6) You just have to have X code installed. --jim On Jul 7, 2010, at 8:00 AM, fossil-users-requ...@lists.fossil-scm.org wrote: > Send fossil-users mailing list submissions to > fossil-users@lists.fossil-scm.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil- > users > > or, via email, send a message with subject or body 'help' to > fossil-users-requ...@lists.fossil-scm.org > > You can reach the person managing the list at > fossil-users-ow...@lists.fossil-scm.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of fossil-users digest..." > > > Today's Topics: > > 1. Makefile (Michael Richter) > 2. Re: Makefile (Paul Ruizendaal) > > > -- > > Message: 1 > Date: Wed, 7 Jul 2010 16:34:31 +0800 > From: Michael Richter > Subject: [fossil-users] Makefile > To: fossil-users@lists.fossil-scm.org > Message-ID: > > Content-Type: text/plain; charset="utf-8" > > I'd like to re-engineer the Makefile approach in fossil so that it's > easier > to work out what needs to be put in place for any given platform. > Is there > enough interest in this that it's worth doing the work in my private > branch > for inspection? > > -- > "Perhaps people don't believe this, but throughout all of the > discussions of > entering China our focus has really been what's best for the Chinese > people. > It's not been about our revenue or profit or whatnot." > --Sergey Brin, demonstrating the emptiness of the "don't be evil" > mantra. > -- next part -- > An HTML attachment was scrubbed... > URL: > http://lists.fossil-scm.org:8080/pipermail/fossil-users/attachments/20100707/33c1059a/attachment-0001.html > > -- > > Message: 2 > Date: Wed, 07 Jul 2010 12:34:52 +0200 > From: Paul Ruizendaal > Subject: Re: [fossil-users] Makefile > To: > Message-ID: <7501112d1ad5951ac50fd5a1e9b6c...@127.0.0.1> > Content-Type: text/plain; charset=UTF-8 > > On Wed, 7 Jul 2010 16:34:31 +0800, Michael Richter > > wrote: >> I'd like to re-engineer the Makefile approach in fossil so that it's > easier >> to work out what needs to be put in place for any given platform. Is > there >> enough interest in this that it's worth doing the work in my private > branch >> for inspection? > > I find that building on Linux and FreeBSD works out of the box, and > I'm > told that cross-building Win executables on Linux with gcc-mingw > installed > also works out of the box. Building on Windows itself with gcc-mingw > doesn't work for me (just mingw installed, not cygwin or msys). I keep > finding myself making the following adjustments to Makefile and > src/main.mk: > > - change from slash to backslash in the file paths > - create VERSION.h by hand: even with awk installed, the quoting > involved > doesn't work > > There was an attempt to fix both issues a few weeks back, but is was a > botched attempt and the changes were backed out. The slash/backslash > thing > should not be too hard to correct, and I'm thinking to have a little C > program to generate VERSION.h instead of using awk for that. The > source is > already heavily preprocessed, so building one more tool should not > upset > the build design. > > Perhaps others can comment on building fossil on OS X and Solaris. > > How can I help? > > Paul > > > > -- > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > > End of fossil-users Digest, Vol 30, Issue 4 > *** ___ 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 for dummies manual
Hi,
Richard Hipp has thoughtfully put the repository for the book on the
Fossil site. The link is now:
http://www.fossil-scm.org/schimpf-book/index
This should GREATLY speed up any access. If you have any suggestions
or would like to make some additions or changes message me:
jim.schi...@gmail.com
And I can give you commit access to the repository if you wish, otherwise I can
put in (and give you credit) any additional chapters or changes you send me.
Thanks for the kind words about the project and Richard's generosity for
hosting this.
--jim schimpf
___
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] Not within an open checkout (ghi?)
I've updated the manual to version 1.6, it's a useful read for fossil users. http://pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi Then pick the PDF link. --jim ___ 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-users Digest, Vol 29, Issue 6
Oh and one more this is on OS X 10.6.3. --jim On Jun 10, 2010, at 8:00 AM, fossil-users-requ...@lists.fossil-scm.org wrote: > Send fossil-users mailing list submissions to > fossil-users@lists.fossil-scm.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil- > users > > or, via email, send a message with subject or body 'help' to > fossil-users-requ...@lists.fossil-scm.org > > You can reach the person managing the list at > fossil-users-ow...@lists.fossil-scm.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of fossil-users digest..." > > > Today's Topics: > > 1. Question about update/multiple users (jim Schimpf) > 2. Re: Question about update/multiple users (Michael) > > > ---------- > > Message: 1 > Date: Wed, 9 Jun 2010 08:07:51 -0400 > From: jim Schimpf > Subject: [fossil-users] Question about update/multiple users > To: fossil-users@lists.fossil-scm.org > Message-ID: <0b6db8a7-c50b-4621-985c-d036bbe90...@gmail.com> > Content-Type: text/plain; charset=us-ascii > > Hi, > > I have a simple Fossil setup with a cgi served master repository > and two users. User A has made some changes, added some files then > done a commit. I wanted to sync user B to this state so he could do > further work. I ran a fossil update but the additional files did > not appear. I looked at the timeline in the server and saw users > A's commit. I then tried in user B's space to do fossil update > where was the hex hash code for the commit. > When I tried this I got: > > 573 FossilBook> fossil update b263813446 > Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 130 1 0 0 > Received: 46 1 0 0 > Total network traffic: 338 bytes sent, 342 bytes received > fossil: no such version: b263813446 > > The version specified doesn't exist in the local repository but does > in the master. I then tried fossil sync, fossil pull with no effect. > > Then user A made another change and check in, at that point fossil > sync got a bunch of changes and then fossil update updated user B's > version of the checkout. (I think just fossil update would have done > both at this point). > > 581 FossilBook> fossil sync > Server:http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 355 5 0 0 > Received: 138 3 0 0 > Send: 449 7 0 0 > Received: 751 5 0 2 > Send: 494 8 0 0 > Received: 827 4 0 1 > Total network traffic: 1400 bytes sent, 1963 bytes received > > 582 FossilBook> fossil update > Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 130 1 0 0 > Received: 138 3 0 0 > Total network traffic: 336 bytes sent, 396 bytes received > ADD Images/Advanced/Simple_Merge/sm_Marilyn.epsf > ADD Images/Advanced/Simple_Merge/sm_after_merge.epsf > ADD Images/Advanced/Simple_Merge/sm_jim_fork.epsf > UPDATE Research/fossilbib.bib > UPDATE fossilbook.lyx > > I don't know if I can reproduce this but I am trying to understand > why it acted in this "sticky" fashion, not getting the first update > and then working when a second was applied. > > --jim > > > > > > > ------ > > Message: 2 > Date: Wed, 9 Jun 2010 07:57:03 -0700 > From: Michael > Subject: Re: [fossil-users] Question about update/multiple users > To: fossil-users@lists.fossil-scm.org > Message-ID: <20100609145703.ge30...@delora.autosys.us> > Content-Type: text/plain; charset=us-ascii > > On Wed, Jun 09, 2010 at 08:07:51AM -0400, jim Schimpf wrote: >> Hi, >> >> I have a simple Fossil setup with a cgi served master repository >> and two users. User A has made some changes, added some files then >> done a commit. I wanted to sync user B to this state so he could >> do further work. I ran a fossil update but the additional files >> did not appear. I looked at the timeline in the server and saw
Re: [fossil-users] fossil-users Digest, Vol 29, Issue 6
In answer to Michael's question, I did do sync then update with the result as noted in the original. I even tried pull instead of sync with no effect. Only after user A did another commit did user B get the update after a sync. (When I tried the sync and pull I would do a local ui with user B to see if the timeline reflected the timeline of the master repository). This is with fossil version [c56af61e5e] 2010-04-22 15:48:25 UTC. --jim On Jun 10, 2010, at 8:00 AM, fossil-users-requ...@lists.fossil-scm.org wrote: > Send fossil-users mailing list submissions to > fossil-users@lists.fossil-scm.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil- > users > > or, via email, send a message with subject or body 'help' to > fossil-users-requ...@lists.fossil-scm.org > > You can reach the person managing the list at > fossil-users-ow...@lists.fossil-scm.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of fossil-users digest..." > > > Today's Topics: > > 1. Question about update/multiple users (jim Schimpf) > 2. Re: Question about update/multiple users (Michael) > > > ---------- > > Message: 1 > Date: Wed, 9 Jun 2010 08:07:51 -0400 > From: jim Schimpf > Subject: [fossil-users] Question about update/multiple users > To: fossil-users@lists.fossil-scm.org > Message-ID: <0b6db8a7-c50b-4621-985c-d036bbe90...@gmail.com> > Content-Type: text/plain; charset=us-ascii > > Hi, > > I have a simple Fossil setup with a cgi served master repository > and two users. User A has made some changes, added some files then > done a commit. I wanted to sync user B to this state so he could do > further work. I ran a fossil update but the additional files did > not appear. I looked at the timeline in the server and saw users > A's commit. I then tried in user B's space to do fossil update > where was the hex hash code for the commit. > When I tried this I got: > > 573 FossilBook> fossil update b263813446 > Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 130 1 0 0 > Received: 46 1 0 0 > Total network traffic: 338 bytes sent, 342 bytes received > fossil: no such version: b263813446 > > The version specified doesn't exist in the local repository but does > in the master. I then tried fossil sync, fossil pull with no effect. > > Then user A made another change and check in, at that point fossil > sync got a bunch of changes and then fossil update updated user B's > version of the checkout. (I think just fossil update would have done > both at this point). > > 581 FossilBook> fossil sync > Server:http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 355 5 0 0 > Received: 138 3 0 0 > Send: 449 7 0 0 > Received: 751 5 0 2 > Send: 494 8 0 0 > Received: 827 4 0 1 > Total network traffic: 1400 bytes sent, 1963 bytes received > > 582 FossilBook> fossil update > Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi >Bytes Cards Artifacts Deltas > Send: 130 1 0 0 > Received: 138 3 0 0 > Total network traffic: 336 bytes sent, 396 bytes received > ADD Images/Advanced/Simple_Merge/sm_Marilyn.epsf > ADD Images/Advanced/Simple_Merge/sm_after_merge.epsf > ADD Images/Advanced/Simple_Merge/sm_jim_fork.epsf > UPDATE Research/fossilbib.bib > UPDATE fossilbook.lyx > > I don't know if I can reproduce this but I am trying to understand > why it acted in this "sticky" fashion, not getting the first update > and then working when a second was applied. > > --jim > > > > > > > ------ > > Message: 2 > Date: Wed, 9 Jun 2010 07:57:03 -0700 > From: Michael > Subject: Re: [fossil-users] Question about update/multiple users > To: fossil-users@lists.fossil-scm.org > Message-ID: <20100609145703.ge30...@delora.autosys.us> > Content-Type: text/plain; charset=us-ascii > > On Wed, Jun 09, 2010 at 08:07:51AM -0400, jim S
[fossil-users] Question about update/multiple users
Hi, I have a simple Fossil setup with a cgi served master repository and two users. User A has made some changes, added some files then done a commit. I wanted to sync user B to this state so he could do further work. I ran a fossil update but the additional files did not appear. I looked at the timeline in the server and saw users A's commit. I then tried in user B's space to do fossil update where was the hex hash code for the commit. When I tried this I got: 573 FossilBook> fossil update b263813446 Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi Bytes Cards Artifacts Deltas Send: 130 1 0 0 Received: 46 1 0 0 Total network traffic: 338 bytes sent, 342 bytes received fossil: no such version: b263813446 The version specified doesn't exist in the local repository but does in the master. I then tried fossil sync, fossil pull with no effect. Then user A made another change and check in, at that point fossil sync got a bunch of changes and then fossil update updated user B's version of the checkout. (I think just fossil update would have done both at this point). 581 FossilBook> fossil sync Server:http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi Bytes Cards Artifacts Deltas Send: 355 5 0 0 Received: 138 3 0 0 Send: 449 7 0 0 Received: 751 5 0 2 Send: 494 8 0 0 Received: 827 4 0 1 Total network traffic: 1400 bytes sent, 1963 bytes received 582 FossilBook> fossil update Autosync: http://j...@pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi Bytes Cards Artifacts Deltas Send: 130 1 0 0 Received: 138 3 0 0 Total network traffic: 336 bytes sent, 396 bytes received ADD Images/Advanced/Simple_Merge/sm_Marilyn.epsf ADD Images/Advanced/Simple_Merge/sm_after_merge.epsf ADD Images/Advanced/Simple_Merge/sm_jim_fork.epsf UPDATE Research/fossilbib.bib UPDATE fossilbook.lyx I don't know if I can reproduce this but I am trying to understand why it acted in this "sticky" fashion, not getting the first update and then working when a second was applied. --jim ___ 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 for dummies PDF
Hi, I've been working on this for a while and thought it might be useful for the group. This is a PDF for a new user of Fossil to show them how to use it in a simple project. It's not for most of the people on this list who know much more than I about Fossil. It is meant to be something you can give to the friend who just wants to use Fossil for his projects. The online documentation on the Fossil site is very good and I used the ideas there for some of the book but personally I really like having a PDF with an active index and TOC for documentation. Here is the site: http://pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi (it's served by Fossil, naturally). If you have comments or want to add to this let me know and I can give you a login and of course credit in the text. I would very much appreciate your comments on what I did or did not do correctly and how it can be improved. --jim schimpf ___ 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 ticket system from command line
For documentation I prefer to use LyX and then produce a PDF and put that into the repository. Then you just have a link from a wiki page of the form: [http:doc/tip/documentation/my_user_man.pdf | User Manual] . The user then has a PDF (with active links in the table of contents and index) of the documentation. The advantage of this is that the user can at his option download the whole thing and print it very easily. Also the formatting if critical can absolutely controlled and doesn't depend on browser issues. This is my preference in documentation as I try to keep all my docs in this form (I actually find iTunes is really great for storing PDFs.) I agree with Richard that the Wiki is great for notes and shorter things but for longer forms and where I want active links in the TOC and index I would rather some other program did that for me. --jim On May 15, 2010, at 9:48 AM, Richard Hipp wrote: > On Sat, May 15, 2010 at 8:23 AM, Gour wrote: > On Sat, 15 May 2010 07:11:35 -0400 > >> "Richard" == Richard Hipp wrote: > > Dear Richard, > > Richard> HTML is not "complete" enough? What do you want to do (or > for > Richard> that matter what does any other wiki system do) that you > can't > Richard> do (in a more "standard" way, I should add) with HTML? > > it is not point that HTML is not "complete", but it is simply too > cumbersome to write documentation in HTML. > > So it really comes down to a matter of personal preference. You say > HTML is cumbersome. I say that Markdown, etc. are arbitrary and > cumbersome. Different people have different ideas. And yet, by > virtue of supporting HTML, the wiki in Fossil is both standard and > complete, for reasonable meanings of those words. What you really > mean to say is that the fossil wiki does not suit your tastes in > wiki and you would prefer something different. It's an emacs versus > vi thing. > > btw, what do you think about: > > http://www.fossil-scm.org/index.html/tktview?name=3e3018e96f ? > > Ticket change histories can be seen by following the links in the > submenu bar at the top of the ticket display. Example: > > http://www.fossil-scm.org/index.html/tkthistory/49929a3557 > http://www.fossil-scm.org/index.html/tkttimeline?name=49929a3557 > > > -- > - > 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] A note and some questions multiple users and fossil
(1) I'm working on a "Fossil for Dummies" document. I would hope this would be useful to the group as it could be passed to a new user to get them started. It tries to answer the questions of someone just starting out in Fossil. The work can be found at: http://pandora.dyn-o-saur.com:8080/cgi-bin/Book.cgi/index You can download the PDF. It is NOT done, I wanted to let the group comment on it to see if I was going in the right direction. Also I set is up as a creative commons document and am open to other authors. (2) While working on the document, the chapter on multiple users brought up some questions. This document repository is a very degenerate case since there is really only one file in work. With multiple users they are going to be editing the same file at the same time. This gets into the merging, branching complications of Fossil. I show a way of handling it here, and while it works is there a better way ? With a larger repository (i.e. more files) this might be less of problem since different users work on different files. Should you for example, do a fossil update while you are working to ensure you are up to date. Oh yes on fossil update, when you run it with the -n option it does not access the network repository but only the local one. So running fossil update and fossil update -n give different results if the master has been updated. --jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] DB Problem (fixed)
Getting the new fossil and running the update as you suggested fixed the problem. Thank you (also you are up VERY early.) --jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] DB Problem
Hi, I have a fossil repository that's been in use for a number of months. The setup is this, I have a master repository on a backed up server and I have my local copy. I don't have it set for autosync since I take the local copy (on a laptop) to remote locations and sync when I get back. Also I've taken to generating a bug/update ticket then adding that bug ticket ID value to the commit line so I can cross reference. Then when I close the ticket I reference the commit ID in the bug ticket statement. Ok, yesterday I went to generate a ticket (on the server copy of the DB). I then did a local commit then did a sync. At that point the commit didn't show up on the server but somehow the bug ticket showed up twice. Then on another try showed up in RED. And now we have for the bug listing -- d6273bad9e 2008-12-04 14:48:17 This ticket had text attached but now doesn't Fixed one edit -- -- 7c35fb8e3f This was the ticket before the latest added 2008-12-04 21:22:32 Feature_Request Tested one Add TL1 functions to this version edit Put a TL1 interface on the ICE. Use already developed EDGE code. jim added on 2008-12-04 21:22:32: Added TL1 code from EDGE, initial runs ok See Database Error access to config.value is prohibited SELECT value FROM config WHERE name='ticket-closed-expr' -- I have run a rebuild but that hasn't made much difference. Any suggestion. Note at this point I am working on copies so destructive edits are just fine Oh yes the version is: [2dffce041d] 2008-12-06 18:02:21 UTC --jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
