Differences From 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)

To Artifact [6910614340]:

• File src/json_branch.c — part of check-in [a4327ba0b6] at 2013-10-13 09:53:45 on branch tkt-change-hook — merge trunk (user: jan.nijtmans size: 11150) [more...]

216
217
218
219
220
221
222
223
224
225
226
227
228
229
230

  db_begin_transaction();
  rootid = name_to_typed_rid(zBasis, "ci");
  if( rootid==0 ){
    zOpt->rcErrMsg = "Basis branch not found.";
    return FSL_JSON_E_RESOURCE_NOT_FOUND;
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST);
  if( pParent==0 ){
    zOpt->rcErrMsg = "Could not read parent manifest.";
    return FSL_JSON_E_UNKNOWN;
  }

  /* Create a manifest for the new branch */
  blob_zero(&branch);

|

216
217
218
219
220
221
222
223
224
225
226
227
228
229
230

  db_begin_transaction();
  rootid = name_to_typed_rid(zBasis, "ci");
  if( rootid==0 ){
    zOpt->rcErrMsg = "Basis branch not found.";
    return FSL_JSON_E_RESOURCE_NOT_FOUND;
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST, 0);
  if( pParent==0 ){
    zOpt->rcErrMsg = "Could not read parent manifest.";
    return FSL_JSON_E_UNKNOWN;
  }

  /* Create a manifest for the new branch */
  blob_zero(&branch);