Fossil

Differences From Artifact [ff99f2dc63]:

• File src/json_branch.c — part of check-in [06f08ed02b] at 2013-09-19 14:42:14 on branch tkt-change-hook — merge trunk (user: jan.nijtmans size: 11144) [more...]

To Artifact [a981c70cf8]:

• File src/json_branch.c — part of check-in [b6cb91ca5b] at 2013-09-19 15:10:42 on branch tkt-change-hook — Some fossil_panic() -> fossil_fatal(). Revert output value of manifest_crosslink() to what it was: 0=error. (user: jan.nijtmans size: 11147)

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);
  run_common_script();
  if( manifest_crosslink(brid, &branch) ){
    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);
  run_common_script();
  if( manifest_crosslink(brid, &branch)==0 ){
    fossil_fatal("%s\n", g.zErrMsg);
  }
  assert( blob_is_reset(&branch) );
  content_deltify(rootid, brid, 0);
  if( zNewRid ){
    *zNewRid = brid;
  }