Differences From:

File src/info.c part of check-in [08db9e11cb] - Track the origin of tags and display that origin in the tag and properities information field of the "vinfo" page. Must "fossil rebuild" after this change. by drh on 2009-01-21 23:40:17. [view]

To:

File src/info.c part of check-in [042a08b564] - Improved messages in the "tags and properties" section of the vinfo page. Distinguish between a merge between forks and a merge between branches. A merge from forks, closes the fork, but not a merge from a branch. by drh on 2009-01-22 01:10:41. [view]

@@ -273,12 +273,12 @@
   db_prepare(&q,
     "SELECT tag.tagid, tagname, "
     "       (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
     "       value, datetime(tagxref.mtime,'localtime'), tagtype,"
-    "       (SELECT uuid FROM blob WHERE rid=tagxref.origid)"
+    "       (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
     "  FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
     " WHERE tagxref.rid=%d AND tagname NOT GLOB '%s'"
-    " ORDER BY tagname", rid, rid, zNotGlob
+    " ORDER BY tagname", rid, rid, rid, zNotGlob
   );
   while( db_step(&q)==SQLITE_ROW ){
     const char *zTagname = db_column_text(&q, 1);
     const char *zSrcUuid = db_column_text(&q, 2);
@@ -293,9 +293,9 @@
     }
     @ <li>
     @ <b>%h(zTagname)</b>
     if( tagtype==0 ){
-      @ <i>cancelled.
+      @ <i>cancelled
     }else if( zValue ){
       @ = %h(zValue)<i>
     }else {
       @ <i>
@@ -308,9 +308,13 @@
         @ propagates to descendants
       }
     }
     if( zSrcUuid && zSrcUuid[0] ){
-      @ added by
+      if( tagtype==0 ){
+        @ by
+      }else{
+        @ added by
+      }
       hyperlink_to_uuid(zSrcUuid);
       @ on %s(zDate)
     }
     @ </i>