Differences From Artifact [35d77c12e4]:

• File src/merge.c — part of check-in [fd8698c8e0] at 2010-12-14 15:44:29 on branch trunk — Simplifications to the merge and update logic. Fix update so that it correctly carries file edits across name changes. (user: drh size: 14443)

To Artifact [ee474b9243]:

• File src/merge.c — part of check-in [76ae862ec9] at 2010-12-15 01:36:32 on branch trunk — Change the merge conflict marks to identify which part is original content and which part is the content merged in. (user: drh size: 14443)

347
348
349
350
351
352
353
354
355
356
357
358
359
360
361

    content_get(ridm, &m);
    blob_zero(&v);
    blob_read_from_file(&v, zFullPath);
    if( isBinary ){
      rc = -1;
      blob_zero(&r);
    }else{
      rc = blob_merge(&p, &m, &v, &r);
    }
    if( rc>=0 ){
      if( !nochangeFlag ){
        blob_write_to_file(&r, zFullPath);
      }
      db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", idv);
      if( rc>0 ){

|

347
348
349
350
351
352
353
354
355
356
357
358
359
360
361

    content_get(ridm, &m);
    blob_zero(&v);
    blob_read_from_file(&v, zFullPath);
    if( isBinary ){
      rc = -1;
      blob_zero(&r);
    }else{
      rc = blob_merge(&p, &v, &m, &r);
    }
    if( rc>=0 ){
      if( !nochangeFlag ){
        blob_write_to_file(&r, zFullPath);
      }
      db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", idv);
      if( rc>0 ){