Diff
Not logged in

Differences From:

File src/timeline.c part of check-in [42c2a18e73] - Change the way branches are tagged: The value of the "branch" property is used to identify the branch name. Repository rebuild required. Also, branches must be retagged. by drh on 2009-01-22 12:03:51. [view]

To:

File src/timeline.c part of check-in [73c23a4279] - Add the ability to cancel existing tags from the web interface, on the "vedit" page. Disable the display of "Leaf" on the timeline for closed leaves. by drh on 2009-01-22 13:52:27. [view]

@@ -254,8 +254,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),
+    @   NOT EXISTS(SELECT 1 FROM tagxref
+    @               WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)
+    @   AND
     @   NOT EXISTS(SELECT 1 FROM plink
     @               WHERE pid=blob.rid
     @                AND coalesce((SELECT value FROM tagxref
     @                              WHERE tagid=%d AND rid=plink.pid), 'trunk')
@@ -269,9 +272,9 @@
     @  FROM event JOIN blob
     @ WHERE blob.rid=event.objid
   ;
   if( zBase==0 ){
-    zBase = mprintf(zBaseSql, TAG_BRANCH, TAG_BRANCH);
+    zBase = mprintf(zBaseSql, TAG_CLOSED, TAG_BRANCH, TAG_BRANCH);
   }
   return zBase;
 }