Differences From Artifact [04ab48bbf4]:

• File src/json_status.c — part of check-in [3f5ab71744] at 2018-07-15 19:56:20 on branch trunk — Clarify the difference between fossil_fatal() and fossil_panic(). The fossil_panic() interface puts a message on the error log when generating webpages. Otherwise the two routines are identical. Convert some fossil_fatal() calls into fossil_panic() where appropriate. The goal here is to limit messages on the error log to things that require attention from the system administrator, or represent bugs. (user: drh size: 5455) [more...]

To Artifact [9aa7c3f2c0]:

• File src/json_status.c — part of check-in [8977dfb032] at 2019-01-19 21:31:01 on branch rid-renumbering — Change the schema of the vmerge table so that it remembers the hash of merged artifacts, not the RID. Schema updates are automatic, but once the update occurs, you are committed to using the newer version of Fossil moving forward. (user: drh size: 5413) [more...]

152
153
154
155
156
157
158
159
160

161
162
163
164
165
166
167

152
153
154
155
156
157
158


159
160
161
162
163
164
165
166

-
-
+

  cson_object_set( oPay, "errorCount", json_new_int( nErr ) );
  db_finalize(&q);

#if 0
  /* TODO: add "merged with" status.  First need (A) to decide on a
     structure and (B) to set up some tests for the multi-merge
     case.*/
  db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid"
                 " WHERE id<=0");
  db_prepare(&q, "SELECT mhash, id FROM vmerge WHERE id<=0");
  while( db_step(&q)==SQLITE_ROW ){
    const char *zLabel = "MERGED_WITH";
    switch( db_column_int(&q, 1) ){
      case -1:  zLabel = "CHERRYPICK ";  break;
      case -2:  zLabel = "BACKOUT    ";  break;
      case -4:  zLabel = "INTEGRATE  ";  break;
    }