Fossil SCM
The timeline correctly shows as a leaf a check-in whose only children are separate branches.
Commit
d820722fe542f0d9f8b5373dedf2ce9338f70a4c
Parent
f6d507179ef14a9…
1 file changed
+5
-1
+5
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -234,11 +234,15 @@ | ||
| 234 | 234 | @ datetime(event.mtime,'localtime') AS timestamp, |
| 235 | 235 | @ coalesce(ecomment, comment), |
| 236 | 236 | @ coalesce(euser, user), |
| 237 | 237 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 238 | 238 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 239 | - @ NOT EXISTS (SELECT 1 FROM plink WHERE pid=blob.rid), | |
| 239 | + @ 0==(SELECT count(*) FROM plink | |
| 240 | + @ WHERE pid=blob.rid AND NOT EXISTS( | |
| 241 | + @ SELECT 1 FROM tagxref | |
| 242 | + @ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch') | |
| 243 | + @ AND rid=plink.cid AND tagtype>0)), | |
| 240 | 244 | @ bgcolor, |
| 241 | 245 | @ event.type, |
| 242 | 246 | @ (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref |
| 243 | 247 | @ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid |
| 244 | 248 | @ AND tagxref.rid=blob.rid AND tagxref.tagtype>0) |
| 245 | 249 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -234,11 +234,15 @@ | |
| 234 | @ datetime(event.mtime,'localtime') AS timestamp, |
| 235 | @ coalesce(ecomment, comment), |
| 236 | @ coalesce(euser, user), |
| 237 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 238 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 239 | @ NOT EXISTS (SELECT 1 FROM plink WHERE pid=blob.rid), |
| 240 | @ bgcolor, |
| 241 | @ event.type, |
| 242 | @ (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref |
| 243 | @ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid |
| 244 | @ AND tagxref.rid=blob.rid AND tagxref.tagtype>0) |
| 245 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -234,11 +234,15 @@ | |
| 234 | @ datetime(event.mtime,'localtime') AS timestamp, |
| 235 | @ coalesce(ecomment, comment), |
| 236 | @ coalesce(euser, user), |
| 237 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 238 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 239 | @ 0==(SELECT count(*) FROM plink |
| 240 | @ WHERE pid=blob.rid AND NOT EXISTS( |
| 241 | @ SELECT 1 FROM tagxref |
| 242 | @ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch') |
| 243 | @ AND rid=plink.cid AND tagtype>0)), |
| 244 | @ bgcolor, |
| 245 | @ event.type, |
| 246 | @ (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref |
| 247 | @ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid |
| 248 | @ AND tagxref.rid=blob.rid AND tagxref.tagtype>0) |
| 249 |