Differences From:

File src/descendents.c part of check-in [c9fdb846fb] - Add the "help" command and the "clean" command. More work is needed on the text for various help messages. by drh on 2007-08-18 02:45:47. [view]

To:

File src/descendents.c part of check-in [b846db063c] - Changes to the CLI version of the timeline command to show places where forks occur in the tree and where content is merged. Lots more work is needed to show the structure of a tree well. This is definitely a work in progress. by drh on 2007-08-25 18:51:54. Also file src/descendents.c part of check-in [b0ad3f90bc] - Merging aku's changes into the head. by drh on 2007-08-25 19:00:33. [view]

@@ -83,9 +83,10 @@
   }
   if( base==0 ) return;
   compute_leaves(base);
   db_prepare(&q,
-    "SELECT uuid, datetime(event.mtime,'localtime'), comment"
+    "SELECT blob.rid, uuid, datetime(event.mtime,'localtime'), comment, 0,"
+    "       (SELECT count(*) FROM plink WHERE cid=blob.rid)"
     "  FROM leaves, blob, event"
     " WHERE blob.rid=leaves.rid"
     "   AND event.objid=leaves.rid"
     " ORDER BY event.mtime DESC"
@@ -104,9 +105,11 @@
   Stmt q;
 
   db_must_be_within_tree();
   db_prepare(&q,
-    "SELECT blob.uuid, datetime(event.mtime,'localtime'), event.comment"
+    "SELECT blob.rid, blob.uuid, datetime(event.mtime,'localtime'),"
+    "       event.comment, 0,"
+    "       (SELECT count(*) FROM plink WHERE cid=blob.rid)"
     "  FROM blob, event"
     " WHERE blob.rid IN"
     "       (SELECT cid FROM plink EXCEPT SELECT pid FROM plink)"
     "   AND event.objid=blob.rid"