Fossil SCM
Fix to the fix to the mtime race condition that was supposed to be fixed by the prior check-in.
Commit
fa5302c28d3b944dc6321a066ab4699666754e75
Parent
af365579e73bd31…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -355,11 +355,11 @@ | ||
| 355 | 355 | } |
| 356 | 356 | if( rc>=0 ){ |
| 357 | 357 | if( !nochangeFlag ){ |
| 358 | 358 | blob_write_to_file(&r, zFullPath); |
| 359 | 359 | } |
| 360 | - db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", ridv); | |
| 360 | + db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", idv); | |
| 361 | 361 | if( rc>0 ){ |
| 362 | 362 | printf("***** %d merge conflicts in %s\n", rc, zName); |
| 363 | 363 | nConflict++; |
| 364 | 364 | } |
| 365 | 365 | }else{ |
| 366 | 366 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -355,11 +355,11 @@ | |
| 355 | } |
| 356 | if( rc>=0 ){ |
| 357 | if( !nochangeFlag ){ |
| 358 | blob_write_to_file(&r, zFullPath); |
| 359 | } |
| 360 | db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", ridv); |
| 361 | if( rc>0 ){ |
| 362 | printf("***** %d merge conflicts in %s\n", rc, zName); |
| 363 | nConflict++; |
| 364 | } |
| 365 | }else{ |
| 366 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -355,11 +355,11 @@ | |
| 355 | } |
| 356 | if( rc>=0 ){ |
| 357 | if( !nochangeFlag ){ |
| 358 | blob_write_to_file(&r, zFullPath); |
| 359 | } |
| 360 | db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", idv); |
| 361 | if( rc>0 ){ |
| 362 | printf("***** %d merge conflicts in %s\n", rc, zName); |
| 363 | nConflict++; |
| 364 | } |
| 365 | }else{ |
| 366 |