Fossil SCM
Fix a long-standing mtime race condition that can cause problems if a "merge" takes places within the same second as an "update".
Commit
af365579e73bd31b9e5594ffe2edad095409b117
Parent
5d42fe9fee45122…
3 files changed
+5
-2
+1
-1
+24
+5
-2
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -307,11 +307,11 @@ | ||
| 307 | 307 | /* Copy content from idm over into idv. Overwrite idv. */ |
| 308 | 308 | printf("UPDATE %s\n", zName); |
| 309 | 309 | if( !nochangeFlag ){ |
| 310 | 310 | undo_save(zName); |
| 311 | 311 | db_multi_exec( |
| 312 | - "UPDATE vfile SET mrid=%d, chnged=2 WHERE id=%d", ridm, idv | |
| 312 | + "UPDATE vfile SET mtime=0, mrid=%d, chnged=2 WHERE id=%d", ridm, idv | |
| 313 | 313 | ); |
| 314 | 314 | vfile_to_disk(0, idv, 0, 0); |
| 315 | 315 | } |
| 316 | 316 | } |
| 317 | 317 | db_finalize(&q); |
| @@ -352,11 +352,14 @@ | ||
| 352 | 352 | blob_zero(&r); |
| 353 | 353 | }else{ |
| 354 | 354 | rc = blob_merge(&p, &m, &v, &r); |
| 355 | 355 | } |
| 356 | 356 | if( rc>=0 ){ |
| 357 | - if( !nochangeFlag ) blob_write_to_file(&r, zFullPath); | |
| 357 | + if( !nochangeFlag ){ | |
| 358 | + blob_write_to_file(&r, zFullPath); | |
| 359 | + } | |
| 360 | + db_multi_exec("UPDATE vfile SET mtime=0 WHERE id=%d", ridv); | |
| 358 | 361 | if( rc>0 ){ |
| 359 | 362 | printf("***** %d merge conflicts in %s\n", rc, zName); |
| 360 | 363 | nConflict++; |
| 361 | 364 | } |
| 362 | 365 | }else{ |
| 363 | 366 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -307,11 +307,11 @@ | |
| 307 | /* Copy content from idm over into idv. Overwrite idv. */ |
| 308 | printf("UPDATE %s\n", zName); |
| 309 | if( !nochangeFlag ){ |
| 310 | undo_save(zName); |
| 311 | db_multi_exec( |
| 312 | "UPDATE vfile SET mrid=%d, chnged=2 WHERE id=%d", ridm, idv |
| 313 | ); |
| 314 | vfile_to_disk(0, idv, 0, 0); |
| 315 | } |
| 316 | } |
| 317 | db_finalize(&q); |
| @@ -352,11 +352,14 @@ | |
| 352 | blob_zero(&r); |
| 353 | }else{ |
| 354 | rc = blob_merge(&p, &m, &v, &r); |
| 355 | } |
| 356 | if( rc>=0 ){ |
| 357 | if( !nochangeFlag ) blob_write_to_file(&r, zFullPath); |
| 358 | if( rc>0 ){ |
| 359 | printf("***** %d merge conflicts in %s\n", rc, zName); |
| 360 | nConflict++; |
| 361 | } |
| 362 | }else{ |
| 363 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -307,11 +307,11 @@ | |
| 307 | /* Copy content from idm over into idv. Overwrite idv. */ |
| 308 | printf("UPDATE %s\n", zName); |
| 309 | if( !nochangeFlag ){ |
| 310 | undo_save(zName); |
| 311 | db_multi_exec( |
| 312 | "UPDATE vfile SET mtime=0, mrid=%d, chnged=2 WHERE id=%d", ridm, idv |
| 313 | ); |
| 314 | vfile_to_disk(0, idv, 0, 0); |
| 315 | } |
| 316 | } |
| 317 | db_finalize(&q); |
| @@ -352,11 +352,14 @@ | |
| 352 | blob_zero(&r); |
| 353 | }else{ |
| 354 | rc = blob_merge(&p, &m, &v, &r); |
| 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 |
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -191,11 +191,11 @@ | ||
| 191 | 191 | currentMtime, id); |
| 192 | 192 | } |
| 193 | 193 | blob_reset(&origCksum); |
| 194 | 194 | blob_reset(&fileCksum); |
| 195 | 195 | } |
| 196 | - if( chnged!=oldChnged ){ | |
| 196 | + if( chnged!=oldChnged && (chnged || !checkMtime) ){ | |
| 197 | 197 | db_multi_exec("UPDATE vfile SET chnged=%d WHERE id=%d", chnged, id); |
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | db_finalize(&q); |
| 201 | 201 | if( nErr ) fossil_fatal("abort due to prior errors"); |
| 202 | 202 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | currentMtime, id); |
| 192 | } |
| 193 | blob_reset(&origCksum); |
| 194 | blob_reset(&fileCksum); |
| 195 | } |
| 196 | if( chnged!=oldChnged ){ |
| 197 | db_multi_exec("UPDATE vfile SET chnged=%d WHERE id=%d", chnged, id); |
| 198 | } |
| 199 | } |
| 200 | db_finalize(&q); |
| 201 | if( nErr ) fossil_fatal("abort due to prior errors"); |
| 202 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | currentMtime, id); |
| 192 | } |
| 193 | blob_reset(&origCksum); |
| 194 | blob_reset(&fileCksum); |
| 195 | } |
| 196 | if( chnged!=oldChnged && (chnged || !checkMtime) ){ |
| 197 | db_multi_exec("UPDATE vfile SET chnged=%d WHERE id=%d", chnged, id); |
| 198 | } |
| 199 | } |
| 200 | db_finalize(&q); |
| 201 | if( nErr ) fossil_fatal("abort due to prior errors"); |
| 202 |
+24
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -252,5 +252,29 @@ | ||
| 252 | 252 | checkout-test 132 { |
| 253 | 253 | 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt |
| 254 | 254 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 255 | 255 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 256 | 256 | } |
| 257 | +fossil merge br5 | |
| 258 | +checkout-test 131 { | |
| 259 | + 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt | |
| 260 | + 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt | |
| 261 | + e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt | |
| 262 | +} | |
| 263 | +fossil commit -nosign -m {merge with rename} -branch {trunk+br5} | |
| 264 | +checkout-test 133 { | |
| 265 | + 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt | |
| 266 | + 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt | |
| 267 | + e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt | |
| 268 | +} | |
| 269 | +fossil update chng3 | |
| 270 | +checkout-test 134 { | |
| 271 | + 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt | |
| 272 | + 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt | |
| 273 | + b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt | |
| 274 | +} | |
| 275 | +fossil update trunk+br5 | |
| 276 | +checkout-test 135 { | |
| 277 | + 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt | |
| 278 | + 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt | |
| 279 | + e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt | |
| 280 | +} | |
| 257 | 281 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -252,5 +252,29 @@ | |
| 252 | checkout-test 132 { |
| 253 | 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt |
| 254 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 255 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 256 | } |
| 257 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -252,5 +252,29 @@ | |
| 252 | checkout-test 132 { |
| 253 | 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt |
| 254 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 255 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 256 | } |
| 257 | fossil merge br5 |
| 258 | checkout-test 131 { |
| 259 | 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt |
| 260 | 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt |
| 261 | e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt |
| 262 | } |
| 263 | fossil commit -nosign -m {merge with rename} -branch {trunk+br5} |
| 264 | checkout-test 133 { |
| 265 | 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt |
| 266 | 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt |
| 267 | e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt |
| 268 | } |
| 269 | fossil update chng3 |
| 270 | checkout-test 134 { |
| 271 | 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt |
| 272 | 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt |
| 273 | b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt |
| 274 | } |
| 275 | fossil update trunk+br5 |
| 276 | checkout-test 135 { |
| 277 | 7eaf64a2c9141277b4c24259c7766d6a77047af7 one.txt |
| 278 | 98e47f99bb9fed4fdcd407f553615ca7f15a38a2 three.txt |
| 279 | e58c5da3e6007d0e30600ea31611813093ad180f two-rename.txt |
| 280 | } |
| 281 |