Differences From Artifact [db1dbae4d7]:

• File src/json_branch.c — part of check-in [c761af63c0] at 2015-01-05 22:39:42 on branch trunk — Fix typo in a new #define. (user: mistachkin size: 11238) [more...]

To Artifact [efbde7b836]:

• File src/json_branch.c — part of check-in [2c42b217e5] at 2016-10-20 16:48:05 on branch trunk — Remove extra newlines from calls to fossil_fatal() (user: andygoth size: 11236) [more...]

290
291
292
293
294
295
296
297
298
299
300
301
302
303
304

  brid = content_put(&branch);
  if( brid==0 ){
    fossil_fatal("Problem committing manifest: %s", g.zErrMsg);
  }
  db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
  if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
    fossil_fatal("%s\n", g.zErrMsg);
  }
  assert( blob_is_reset(&branch) );
  content_deltify(rootid, brid, 0);
  if( zNewRid ){
    *zNewRid = brid;
  }

|

290
291
292
293
294
295
296
297
298
299
300
301
302
303
304

  brid = content_put(&branch);
  if( brid==0 ){
    fossil_fatal("Problem committing manifest: %s", g.zErrMsg);
  }
  db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
  if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
    fossil_fatal("%s", g.zErrMsg);
  }
  assert( blob_is_reset(&branch) );
  content_deltify(rootid, brid, 0);
  if( zNewRid ){
    *zNewRid = brid;
  }