Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| 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. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ba6687f2423d5388b9de863840834730 |
| User & Date: | drh 2009-01-21 03:04:10.000 |
Context
|
2009-01-21
| ||
| 03:12 | Do not print a warning about "a fork has occurred" when checking in to a leaf that is also the basis of a branch. ... (check-in: 8d5ab7913e user: drh tags: trunk) | |
| 03:04 | In the timeline, continue to show the of a branch as a "Leaf" even after the branch has been merged into some other line. ... (check-in: ba6687f242 user: drh tags: trunk) | |
| 02:54 | The "fossil info" command now shows tags associated with the current check-out. ... (check-in: 2521a0a9a7 user: drh tags: trunk) | |
Changes
Changes to src/timeline.c.
| ︙ | ︙ | |||
81 82 83 84 85 86 87 |
** A non-branch child is a child that omits the "newbranch" tag.
*/
int count_nonbranch_children(int pid){
int nNonBranch;
nNonBranch = db_int(0,
"SELECT count(*) FROM plink"
| | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
** A non-branch child is a child that omits the "newbranch" tag.
*/
int count_nonbranch_children(int pid){
int nNonBranch;
nNonBranch = db_int(0,
"SELECT count(*) FROM plink"
" WHERE pid=%d AND isprim"
" AND NOT EXISTS(SELECT 1 FROM tagxref"
" WHERE tagid=%d"
" AND rid=cid"
" AND tagtype>0"
" )",
pid, TAG_NEWBRANCH
);
|
| ︙ | ︙ | |||
242 243 244 245 246 247 248 |
@ uuid,
@ datetime(event.mtime,'localtime') AS timestamp,
@ 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
| | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
@ uuid,
@ datetime(event.mtime,'localtime') AS timestamp,
@ 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 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,
@ (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref
@ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid
|
| ︙ | ︙ |