Check-in [82d648ae01]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:better check (I thought, but closer look revealed that it was not better at all!)
Timelines: family | ancestors | mistake
Files: files | file ages | folders
SHA1:82d648ae0150dfba2204d0551a14b2b60c4085b1
User & Date: jan.nijtmans 2013-10-04 15:01:15
Original Comment: better check
Context
2013-10-04
15:01
better check (I thought, but closer look revealed that it was not better at all!) Closed-Leaf check-in: 82d648ae01 user: jan.nijtmans tags: mistake
14:53
Added a check/failure for the RID mismatch case discussed at length on the ML today. Edit: nevermind: this check is far from being complete/valid, per discussion with Jan, as it can pick up non-artifacts as a parent. check-in: 7bf9fdb068 user: stephan tags: mistake
Changes

Changes to src/checkin.c.

986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
  int i;                      /* Loop counter */
  const char *zColor;         /* Modified value of p->zColor */

  assert( pBaseline==0 || pBaseline->zBaseline==0 );
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
  if(vid>0 && !zParentUuid){
    fossil_fatal("Could not find UUID for RID %d", vid);
  }
  else if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);
    nFBcard++;







|







986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
  int i;                      /* Loop counter */
  const char *zColor;         /* Modified value of p->zColor */

  assert( pBaseline==0 || pBaseline->zBaseline==0 );
  assert( pBaseline==0 || zBaselineUuid!=0 );
  blob_zero(pOut);
  zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
  if(vid>0 && (!zParentUuid || !validate16(zParentUuid, UUID_SIZE)) ){
    fossil_fatal("Could not find UUID for RID %d", vid);
  }
  else if( pBaseline ){
    blob_appendf(pOut, "B %s\n", zBaselineUuid);
    manifest_file_rewind(pBaseline);
    pFile = manifest_file_next(pBaseline, 0);
    nFBcard++;