Fossil SCM
doc fix
Commit
122b631c31f46da462d4b1e82cf78f983207d44a
Parent
273ec22f25699c1…
1 file changed
+2
-2
+2
-2
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -77,11 +77,11 @@ | ||
| 77 | 77 | ** named files are candidates to be updated. If FILES is omitted, all |
| 78 | 78 | ** files in the current checkout are subject to be updated. Using |
| 79 | 79 | ** a directory name for one of the FILES arguments is the same as |
| 80 | 80 | ** using every subdirectory and file beneath that directory. |
| 81 | 81 | ** |
| 82 | -** The -n or --nochange option causes this command to do a "dry run". It | |
| 82 | +** The -n or --dry-run option causes this command to do a "dry run". It | |
| 83 | 83 | ** prints out what would have happened but does not actually make any |
| 84 | 84 | ** changes to the current checkout or the repository. |
| 85 | 85 | ** |
| 86 | 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | 87 | ** files in addition to those file that actually do change. |
| @@ -532,11 +532,11 @@ | ||
| 532 | 532 | |
| 533 | 533 | /* |
| 534 | 534 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 535 | 535 | */ |
| 536 | 536 | if( dryRunFlag ){ |
| 537 | - db_end_transaction(1); /* With --nochange, rollback changes */ | |
| 537 | + db_end_transaction(1); /* With --dry-run, rollback changes */ | |
| 538 | 538 | }else{ |
| 539 | 539 | ensure_empty_dirs_created(); |
| 540 | 540 | if( g.argc<=3 ){ |
| 541 | 541 | /* All files updated. Shift the current checkout to the target. */ |
| 542 | 542 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 543 | 543 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -77,11 +77,11 @@ | |
| 77 | ** named files are candidates to be updated. If FILES is omitted, all |
| 78 | ** files in the current checkout are subject to be updated. Using |
| 79 | ** a directory name for one of the FILES arguments is the same as |
| 80 | ** using every subdirectory and file beneath that directory. |
| 81 | ** |
| 82 | ** The -n or --nochange option causes this command to do a "dry run". It |
| 83 | ** prints out what would have happened but does not actually make any |
| 84 | ** changes to the current checkout or the repository. |
| 85 | ** |
| 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | ** files in addition to those file that actually do change. |
| @@ -532,11 +532,11 @@ | |
| 532 | |
| 533 | /* |
| 534 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 535 | */ |
| 536 | if( dryRunFlag ){ |
| 537 | db_end_transaction(1); /* With --nochange, rollback changes */ |
| 538 | }else{ |
| 539 | ensure_empty_dirs_created(); |
| 540 | if( g.argc<=3 ){ |
| 541 | /* All files updated. Shift the current checkout to the target. */ |
| 542 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 543 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -77,11 +77,11 @@ | |
| 77 | ** named files are candidates to be updated. If FILES is omitted, all |
| 78 | ** files in the current checkout are subject to be updated. Using |
| 79 | ** a directory name for one of the FILES arguments is the same as |
| 80 | ** using every subdirectory and file beneath that directory. |
| 81 | ** |
| 82 | ** The -n or --dry-run option causes this command to do a "dry run". It |
| 83 | ** prints out what would have happened but does not actually make any |
| 84 | ** changes to the current checkout or the repository. |
| 85 | ** |
| 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | ** files in addition to those file that actually do change. |
| @@ -532,11 +532,11 @@ | |
| 532 | |
| 533 | /* |
| 534 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 535 | */ |
| 536 | if( dryRunFlag ){ |
| 537 | db_end_transaction(1); /* With --dry-run, rollback changes */ |
| 538 | }else{ |
| 539 | ensure_empty_dirs_created(); |
| 540 | if( g.argc<=3 ){ |
| 541 | /* All files updated. Shift the current checkout to the target. */ |
| 542 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 543 |