Fossil SCM
Typo fixes.
Commit
e19439801bd6149bbcbbcb3ffbfb60d211c83ea589ab9450754b40920da408f0
Parent
9051aef2b88034a…
1 file changed
+2
-2
+2
-2
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -279,11 +279,11 @@ | ||
| 279 | 279 | ** |
| 280 | 280 | ** Options: |
| 281 | 281 | ** -f|--force Ignore edited files in the current check-out |
| 282 | 282 | ** -k|--keep Only update the manifest file(s) |
| 283 | 283 | ** --force-missing Force check-out even if content is missing |
| 284 | -** --prompt Prompt before overwritting when --force is used | |
| 284 | +** --prompt Prompt before overwriting when --force is used | |
| 285 | 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | 286 | ** times (the timestamp of the last check-in which modified |
| 287 | 287 | ** them) |
| 288 | 288 | ** |
| 289 | 289 | ** See also: [[update]] |
| @@ -307,11 +307,11 @@ | ||
| 307 | 307 | latestFlag = find_option("latest",0,0)!=0; |
| 308 | 308 | promptFlag = find_option("prompt",0,0)!=0 || forceFlag==0; |
| 309 | 309 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 310 | 310 | |
| 311 | 311 | if( keepFlag != 0 ){ |
| 312 | - /* After flag collection to explicitly don't affect promptFlag */ | |
| 312 | + /* After flag collection, in order not to affect promptFlag */ | |
| 313 | 313 | forceFlag=1; |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /* We should be done with options.. */ |
| 317 | 317 | verify_all_options(); |
| 318 | 318 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -279,11 +279,11 @@ | |
| 279 | ** |
| 280 | ** Options: |
| 281 | ** -f|--force Ignore edited files in the current check-out |
| 282 | ** -k|--keep Only update the manifest file(s) |
| 283 | ** --force-missing Force check-out even if content is missing |
| 284 | ** --prompt Prompt before overwritting when --force is used |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last check-in which modified |
| 287 | ** them) |
| 288 | ** |
| 289 | ** See also: [[update]] |
| @@ -307,11 +307,11 @@ | |
| 307 | latestFlag = find_option("latest",0,0)!=0; |
| 308 | promptFlag = find_option("prompt",0,0)!=0 || forceFlag==0; |
| 309 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 310 | |
| 311 | if( keepFlag != 0 ){ |
| 312 | /* After flag collection to explicitly don't affect promptFlag */ |
| 313 | forceFlag=1; |
| 314 | } |
| 315 | |
| 316 | /* We should be done with options.. */ |
| 317 | verify_all_options(); |
| 318 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -279,11 +279,11 @@ | |
| 279 | ** |
| 280 | ** Options: |
| 281 | ** -f|--force Ignore edited files in the current check-out |
| 282 | ** -k|--keep Only update the manifest file(s) |
| 283 | ** --force-missing Force check-out even if content is missing |
| 284 | ** --prompt Prompt before overwriting when --force is used |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last check-in which modified |
| 287 | ** them) |
| 288 | ** |
| 289 | ** See also: [[update]] |
| @@ -307,11 +307,11 @@ | |
| 307 | latestFlag = find_option("latest",0,0)!=0; |
| 308 | promptFlag = find_option("prompt",0,0)!=0 || forceFlag==0; |
| 309 | setmtimeFlag = find_option("setmtime",0,0)!=0; |
| 310 | |
| 311 | if( keepFlag != 0 ){ |
| 312 | /* After flag collection, in order not to affect promptFlag */ |
| 313 | forceFlag=1; |
| 314 | } |
| 315 | |
| 316 | /* We should be done with options.. */ |
| 317 | verify_all_options(); |
| 318 |