Fossil SCM
Making 'fossil merge' also report a conflict for extra files overwritten. Like [60c6197c8a], but for the merge operation. Related to ticket [953031915f].
Commit
bb49278a8ad04bdbf9ae9039bf191579483fe0ee
Parent
e1a7a1d9e267213…
1 file changed
+4
+4
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -328,10 +328,14 @@ | ||
| 328 | 328 | ); |
| 329 | 329 | idv = db_last_insert_rowid(); |
| 330 | 330 | db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); |
| 331 | 331 | zName = db_column_text(&q, 2); |
| 332 | 332 | fossil_print("ADDED %s\n", zName); |
| 333 | + if ( file_wd_isfile_or_link(zName) ) { | |
| 334 | + fossil_print("***** The extra file %s has been overwritten\n", zName); | |
| 335 | + nConflict++; | |
| 336 | + } | |
| 333 | 337 | if( !nochangeFlag ){ |
| 334 | 338 | undo_save(zName); |
| 335 | 339 | vfile_to_disk(0, idm, 0, 0); |
| 336 | 340 | } |
| 337 | 341 | } |
| 338 | 342 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -328,10 +328,14 @@ | |
| 328 | ); |
| 329 | idv = db_last_insert_rowid(); |
| 330 | db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); |
| 331 | zName = db_column_text(&q, 2); |
| 332 | fossil_print("ADDED %s\n", zName); |
| 333 | if( !nochangeFlag ){ |
| 334 | undo_save(zName); |
| 335 | vfile_to_disk(0, idm, 0, 0); |
| 336 | } |
| 337 | } |
| 338 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -328,10 +328,14 @@ | |
| 328 | ); |
| 329 | idv = db_last_insert_rowid(); |
| 330 | db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); |
| 331 | zName = db_column_text(&q, 2); |
| 332 | fossil_print("ADDED %s\n", zName); |
| 333 | if ( file_wd_isfile_or_link(zName) ) { |
| 334 | fossil_print("***** The extra file %s has been overwritten\n", zName); |
| 335 | nConflict++; |
| 336 | } |
| 337 | if( !nochangeFlag ){ |
| 338 | undo_save(zName); |
| 339 | vfile_to_disk(0, idm, 0, 0); |
| 340 | } |
| 341 | } |
| 342 |