Fossil

Differences From Artifact [2a9e42a28f]:

• File src/update.c — part of check-in [31c52c7b3e] at 2010-12-23 02:22:20 on branch trunk — Add new function fossil_strcmp() that works like strcmp() except that it handles NULL arguments correctly. Use fossil_strcmp() in place of strcmp() in many places in the code. (user: drh size: 19035)

To Artifact [7fafa82267]:

• File src/update.c — part of check-in [0b8aed945e] at 2011-01-18 18:36:08 on branch trunk — Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] (user: drh size: 19063)

404
405
406
407
408
409
410
411

412
413
414
415
416
417
418

  /* Report on conflicts
  */
  if( nConflict && !nochangeFlag ){
    if( internalUpdate ){
      internalConflictCnt = nConflict;
    }else{
      printf("WARNING: merge conflicts - see messages above for details.\n");

    }
  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( nochangeFlag ){

|
>

404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419

  /* Report on conflicts
  */
  if( nConflict && !nochangeFlag ){
    if( internalUpdate ){
      internalConflictCnt = nConflict;
    }else{
      printf("WARNING: %d merge conflicts - see messages above for details.\n",
              nConflict);
    }
  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( nochangeFlag ){