Differences From:

File src/timeline.c part of check-in [580d6ad8c7] - Suppress the display of the artificate ID on the timeline which showing changes to wiki or tickets. by drh on 2009-01-21 01:23:40. [view]

To:

File src/timeline.c part of check-in [ba6687f242] - In the timeline, continue to show the of a branch as a "Leaf" even after the branch has been merged into some other line. by drh on 2009-01-21 03:04:10. [view]

@@ -84,9 +84,9 @@
   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"
@@ -245,9 +245,9 @@
     @   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,