Oh and one more this is on OS X 10.6.3. --jim On Jun 10, 2010, at 8:00 AM, [email protected] wrote:
> Send fossil-users mailing list submissions to > [email protected] > > 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 > [email protected] > > You can reach the person managing the list at > [email protected] > > 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 <[email protected]> > Subject: [fossil-users] Question about update/multiple users > To: [email protected] > Message-ID: <[email protected]> > 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 > <version> where <version> was the hex hash code for the commit. > When I tried this I got: > > 573 FossilBook> fossil update b263813446 > Autosync: http://[email protected]: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://[email protected]: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://[email protected]: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 <[email protected]> > Subject: Re: [fossil-users] Question about update/multiple users > To: [email protected] > Message-ID: <[email protected]> > 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 >> users A's commit. I then tried in user B's space to do fossil >> update <version> where <version> was the hex hash code for the >> commit. When I tried this I got: > <znip> >> >> --jim > _______________________________________________________________________ > > I use a similar setup (i.e. "master" shared server/repository and > two remote laptops each with their own fossil repository, and each > with their 'fossil remote-url' pointing to the "master". > > When user 'A' commits, user 'B' does > > $ fossil sync > $ fossil update > > to get most recent user 'A' commits on "master" to user 'B' local > repo. This works reliably on our GNU/Linux systems. > > $ fossil version > This is fossil version [7c2577bd63] 2010-03-18 14:40:46 UTC > > In your original post, you did not specify that you explicitly did > the sync *before* the update on your first try at updating user 'B'. > > > ~Michael > > > > ------------------------------ > > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > > End of fossil-users Digest, Vol 29, Issue 6 > ******************************************* _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
