Overview
| SHA1 Hash: | ba6687f2423d5388b9de8638408347309b30810e |
|---|---|
| Date: | 2009-01-21 03:04:10 |
| User: | drh |
| Comment: | In the timeline, continue to show the of a branch as a "Leaf" even after the branch has been merged into some other line. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/timeline.c from [7e388fb127] to [300c2cb824].
@@ -83,11 +83,11 @@
int count_nonbranch_children(int pid){
int nNonBranch;
nNonBranch = db_int(0,
"SELECT count(*) FROM plink"
- " WHERE pid=%d"
+ " WHERE pid=%d AND isprim"
" AND NOT EXISTS(SELECT 1 FROM tagxref"
" WHERE tagid=%d"
" AND rid=cid"
" AND tagtype>0"
" )",
@@ -244,11 +244,11 @@
@ coalesce(ecomment, comment),
@ coalesce(euser, user),
@ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1),
@ (SELECT count(*) FROM plink WHERE cid=blob.rid),
@ 0==(SELECT count(*) FROM plink
- @ WHERE pid=blob.rid AND NOT EXISTS(
+ @ WHERE pid=blob.rid AND isprim AND NOT EXISTS(
@ SELECT 1 FROM tagxref
@ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch')
@ AND rid=plink.cid AND tagtype>0)),
@ bgcolor,
@ event.type,