Fossil SCM
For 'update --dry-run', remind the user that no file changes have occurred.'
Commit
06a72cea3aa06bdee63d4c66f8fba0c1cd81213c24cf6afd6ae7eed9929c7fc8
Parent
a04d18198d85423…
1 file changed
+3
+3
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -616,10 +616,13 @@ | ||
| 616 | 616 | /* |
| 617 | 617 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 618 | 618 | */ |
| 619 | 619 | if( dryRunFlag ){ |
| 620 | 620 | db_end_transaction(1); /* With --dry-run, rollback changes */ |
| 621 | + fossil_warning("\nREMINDER: this was a dry run -" | |
| 622 | + " no files were actually changed " | |
| 623 | + "(checkout is still %.10s).", rid_to_uuid(vid)); | |
| 621 | 624 | }else{ |
| 622 | 625 | char *zPwd; |
| 623 | 626 | ensure_empty_dirs_created(1); |
| 624 | 627 | sqlite3_create_function(g.db, "rmdir", 1, SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
| 625 | 628 | file_rmdir_sql_function, 0, 0); |
| 626 | 629 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -616,10 +616,13 @@ | |
| 616 | /* |
| 617 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 618 | */ |
| 619 | if( dryRunFlag ){ |
| 620 | db_end_transaction(1); /* With --dry-run, rollback changes */ |
| 621 | }else{ |
| 622 | char *zPwd; |
| 623 | ensure_empty_dirs_created(1); |
| 624 | sqlite3_create_function(g.db, "rmdir", 1, SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
| 625 | file_rmdir_sql_function, 0, 0); |
| 626 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -616,10 +616,13 @@ | |
| 616 | /* |
| 617 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 618 | */ |
| 619 | if( dryRunFlag ){ |
| 620 | db_end_transaction(1); /* With --dry-run, rollback changes */ |
| 621 | fossil_warning("\nREMINDER: this was a dry run -" |
| 622 | " no files were actually changed " |
| 623 | "(checkout is still %.10s).", rid_to_uuid(vid)); |
| 624 | }else{ |
| 625 | char *zPwd; |
| 626 | ensure_empty_dirs_created(1); |
| 627 | sqlite3_create_function(g.db, "rmdir", 1, SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
| 628 | file_rmdir_sql_function, 0, 0); |
| 629 |