Re: [fossil-users] multiple open leaf on closed branches?
On Tue, Jun 7, 2016 at 2:27 AM, Luca Ferrari wrote: > > In the meantime I've tried the desperate trick: > > % fossil merge --integrate --force aa9521ccd9 > > but the leaf is still listed on the open ones. > As Richard said, it's not a real problem. I would suggest you compare the files in the extra open leaf with it's sibling commit(s) to be sure you don't miss any changes. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] When is 'tip' not 'trunk'
Hit an unexpected thing today cloning a just-committed repo to a new computer. I cloned the repo from server, then did 'fossil open D:/path/to/repo.fossil'. It left me with a checkout whose directory structure was almost a year old. A looking at the timeline, it all looked good. Looking at the All Files, and Trunk views in the browser show the "old" structure I got with "fossil open" The "Tip" view, fortunately, showed what I expect, and "fossil co tip" got me what I expected in the checkout. But I don't understand why trunk and tip are not the same. What am I missing? Both clients (committer and cloner) have fossil version 1.32 [6c40678e91] 2015-03-14 13:20:34 UTC on Windows 7x64 The server has fossil version [6c40678e91] 2015-03-14 13:20:34 on Linux. Thanks in advance. -Clark ___ 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] multiple open leaf on closed branches?
On 6/7/16, Luca Ferrari wrote: > On Mon, Jun 6, 2016 at 10:59 AM, Richard Hipp wrote: >> No. Can you make the repo available for analysis? >> > > Sorry, my employer does not grant me to do it. Is there anything I can > export that can be useful? The repo is actually 800+MB. > > In the meantime I've tried the desperate trick: > > % fossil merge --integrate --force aa9521ccd9 > > but the leaf is still listed on the open ones. There is nothing inherently wrong with having open leaves. You could simply ignore the issue. -- 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
