Ok, Didn't realize there was a disconnected Leaf in the remote repo. c:\myrepo> fossil merge 88d803c051 worked.
We still are unsure what created the disconnect? Though we seem to have hiccups when upgrading the fossil.exe and doing rebuilds on both local and remote repos. On Tue, Aug 30, 2011 at 7:10 PM, <[email protected]> wrote: > Hi, > I ran into a snag today after a week away on vacation. > This is fossil version 1.18 [df9da91ba8] 2011-07-13 23:03:41 UTC > > I performed a pull. > c:\myrepo> fossil pull t:\myrepo\myrepo1.fossil > ...lots of changes came down the network... > Bytes Cards Artifacts Deltas > Sent: 130 1 0 0 > Received: 2056 45 0 0 > Sent: 1023 20 0 0 > Received: 11346 64 0 19 > Total network traffic: 957 bytes sent, 6805 bytes received > > I then ran an update. > c:\myrepo> fossil update > ...nothing happened. no report? > ...But I assumed my checkout contained the latest changes. > ...So I began to edit my code and noticed none of the changes were there. > > Question: What should I do in this case? > > I eventually got things aligned with 2 cycles of close/open. > Not sure why? > I ran a close. > c:\myrepo> fossil close > > I ran an open. > c:\myrepo> fossil open myrepo.fossil > ...Still no update of my folder contents! > Repeat worked. > > Maybe if I automated this via a script, I would have stopped > immediately after receiving no report on the update? > > Thanks for your help. > _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
