Yes, it was obvious with the new version and it shows I don't
understand the concept of "leaf". The current path shows two leaves and
checkins were done on different leaves. So leaves are something Fossil
automatically generates but branches are something the user imposes on the
repository ?
I have built fossil version [822133a763] 2010-04-22 12:44:25 UTC
(calling it new_fossil) and rebuilt the repository. I then found Paul
Services's scripts and found that you close a leaf like THIS:
551 XTEST> new_fossil tag --raw add closed e5db0f1b43
552 XTEST> new_fossil tag list e5db0f1b43
closed
trunk
The --raw is most important, if not present the tag closed doesn't work.
--jim schimpf
On 22 Apr, 2010, at 7:48, D. Richard Hipp wrote:
>
> On Apr 22, 2010, at 7:29 AM, verizon wrote:
>
>> No the repository has no branches. I did find the server where the
>> repository is kept had a clock that was 1 hour ahead of current
>> time. (Not sure how it got that way, it had shifted to Daylight
>> savings time but was an hour ahead). Anyway this is now fixed but
>> the problem persists.
>>
>> Also I have my repository set to NOT auto sync since I am frequently
>> not connected to the company network. But when I sync I sometimes
>> have to do this a number of times before it stabilizes and large
>> chunks of data stop being exchanged.
>>
>> I am running fossil version [2255e4e3ba] 2009-12-20 02:58:18 UTC.
>
> Are you *sure* you are not on separate forks of the same branch?
>
> If you upgrade to the latest version of Fossil, you'll see a graph of
> changes on the left hand side of the timeline. That graph might give
> clues to your problem. Remember to run "fossil rebuild" after
> upgrading.
>
>>
>> --jim schimpf
>> On 21 Apr, 2010, at 16:44, D. Richard Hipp wrote:
>>
>>>
>>> On Apr 21, 2010, at 4:39 PM, verizon wrote:
>>>
>>>> I am working on a project with another developer and we are using a
>>>> server hosted fossil repository and have hit this problem. When say
>>>> I make changes to some source files, commit this to the repository
>>>> and sync with the network server. The other developer then sync's
>>>> with the repository but then fossil update does not show any changes
>>>> needed. So he does not see any file changes with command:
>>>>
>>>> fossil update -n -v | grep -v UNCHANGED
>>>>
>>>> We have found (at least for now) the easiest approach is to blow
>>>> away his source files, do fossil open to his (synched) local
>>>> repository and then he has the updated files.
>>>>
>>>> I know I am missing something really obvious here as I thought just
>>>> this situation was what source control systems were for. I had not
>>>> noticed this previously since I was the only one using the
>>>> repository.
>>>>
>>>
>>> This might happen if the you and the other developer are on separate
>>> branches or forks. Try running
>>>
>>> fossil update --latest
>>>
>>> And/or run "fossil ui" and look at the graph to see whether or not
>>> you
>>> are on separate forks, and if so, merge them together.
>>>
>>> If you just run "fossil update" it moves you to the latest check-in
>>> which is a direct descendent of your current check-in. So if another
>>> developer has made check-ins that are on a different branch or fork,
>>> nothing will happen.
>>>
>>> D. Richard Hipp
>>> d...@hwaci.com
>>>
>>>
>>>
>>> _______________________________________________
>>> 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
>
> D. Richard Hipp
> d...@hwaci.com
>
>
>
> _______________________________________________
> 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
