(Discussion moved back to the mailing list) On Fri, Apr 22, 2011 at 10:47 AM, Stephan Beal <sgb...@googlemail.com>wrote:
> On Fri, Apr 22, 2011 at 3:50 PM, Richard Hipp <d...@sqlite.org> wrote: > >> I just checked in a change. If after upgrading and running "rebuild" you >> still see a discrepency, please let me know. Thanks. >> > > [stephan@cheyenne:~/cvs/fossil/cson]$ f version > This is fossil version [0d73bd672b] 2011-04-04 09:31:14 UTC > > That's this trunk: > > 13:49:13 [0a89d03cf6] Fix the is_a_leaf() function so that it correctly > identifies nodes as leaves if they have no non-merge children in > the > same branch. (user: drh tags: trunk) > > merged with a JSON-related local branch of mine (which only slightly > changes the timeline and tickets output). > > [stephan@cheyenne:~/cvs/fossil/cson]$ f rebuild > 100.0% complete... > [stephan@cheyenne:~/cvs/fossil/cson]$ f leaves --reconstruct > === 2011-04-22 === > 13:14:39 [50c1c35534] *CURRENT* Removed a no-longer-valid FIXME. (user: > stephan tags: trunk) > === 2011-04-18 === > 22:07:39 [1ce6fae1d1] Added 'sgb' Makefile target for my own convenience. > (user: stephan tags: trunk) > [stephan@cheyenne:~/cvs/fossil/cson]$ f ui > Created new window in existing browser session. > > i'm still seeing 2 leaves. > > Again - not a big deal, so please don't expend too much effort on it. > The current definition of a "leaf" is this: A node that has no non-merge children with the same branch tag. In the case above, both leaves meet this definition. The second "leaf" is a case where the trunk forked, and then you merged the fork together. One line of this fork has no non-merge children (its only child is the merge back into the other line) and so it qualifies as leaf. You might argue that we should change the definition of leaf to be "A node that as no children of any kind (merge or non-merge) with the same branch tag." I'm not sure what the consequences of that change would be, but I'm betting there would be some and that they would be subtle. Do you think we should try it? > > Happy Hacking! > > -- > ----- stephan beal > http://wanderinghorse.net/home/stephan/ > -- 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
