Fossil SCM
Fix typos in the "fossil update" logic.
Commit
5a1d13ee502c5c1f32b51af3fe0beca5fe3ffbd8
Parent
1dc3881129c85d7…
1 file changed
+2
-2
+2
-2
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -224,11 +224,11 @@ | ||
| 224 | 224 | " islinkv BOOLEAN," /* True if current file is a link */ |
| 225 | 225 | " islinkt BOOLEAN," /* True if target file is a link */ |
| 226 | 226 | " ridv INTEGER," /* Record ID for current version */ |
| 227 | 227 | " ridt INTEGER," /* Record ID for target */ |
| 228 | 228 | " isexe BOOLEAN," /* Does target have execute permission? */ |
| 229 | - " deleted BOOLEAN DEFAULT 0,"/* File marke by "rm" to become unmanaged */ | |
| 229 | + " deleted BOOLEAN DEFAULT 0,"/* File marked by "rm" to become unmanaged */ | |
| 230 | 230 | " fnt TEXT %s" /* Filename of same file on target version */ |
| 231 | 231 | ");", |
| 232 | 232 | filename_collation(), filename_collation() |
| 233 | 233 | ); |
| 234 | 234 | |
| @@ -400,11 +400,11 @@ | ||
| 400 | 400 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 401 | 401 | }else if( idt>0 && idv>0 && ridt!=ridv && (chnged==0 || deleted) ){ |
| 402 | 402 | /* The file is unedited. Change it to the target version */ |
| 403 | 403 | undo_save(zName); |
| 404 | 404 | if( deleted ){ |
| 405 | - fossil_print("UPDATE %s - change to unmanged file\n", zName); | |
| 405 | + fossil_print("UPDATE %s - change to unmanaged file\n", zName); | |
| 406 | 406 | }else{ |
| 407 | 407 | fossil_print("UPDATE %s\n", zName); |
| 408 | 408 | } |
| 409 | 409 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 410 | 410 | }else if( idt>0 && idv>0 && file_wd_size(zFullPath)<0 ){ |
| 411 | 411 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -224,11 +224,11 @@ | |
| 224 | " islinkv BOOLEAN," /* True if current file is a link */ |
| 225 | " islinkt BOOLEAN," /* True if target file is a link */ |
| 226 | " ridv INTEGER," /* Record ID for current version */ |
| 227 | " ridt INTEGER," /* Record ID for target */ |
| 228 | " isexe BOOLEAN," /* Does target have execute permission? */ |
| 229 | " deleted BOOLEAN DEFAULT 0,"/* File marke by "rm" to become unmanaged */ |
| 230 | " fnt TEXT %s" /* Filename of same file on target version */ |
| 231 | ");", |
| 232 | filename_collation(), filename_collation() |
| 233 | ); |
| 234 | |
| @@ -400,11 +400,11 @@ | |
| 400 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 401 | }else if( idt>0 && idv>0 && ridt!=ridv && (chnged==0 || deleted) ){ |
| 402 | /* The file is unedited. Change it to the target version */ |
| 403 | undo_save(zName); |
| 404 | if( deleted ){ |
| 405 | fossil_print("UPDATE %s - change to unmanged file\n", zName); |
| 406 | }else{ |
| 407 | fossil_print("UPDATE %s\n", zName); |
| 408 | } |
| 409 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 410 | }else if( idt>0 && idv>0 && file_wd_size(zFullPath)<0 ){ |
| 411 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -224,11 +224,11 @@ | |
| 224 | " islinkv BOOLEAN," /* True if current file is a link */ |
| 225 | " islinkt BOOLEAN," /* True if target file is a link */ |
| 226 | " ridv INTEGER," /* Record ID for current version */ |
| 227 | " ridt INTEGER," /* Record ID for target */ |
| 228 | " isexe BOOLEAN," /* Does target have execute permission? */ |
| 229 | " deleted BOOLEAN DEFAULT 0,"/* File marked by "rm" to become unmanaged */ |
| 230 | " fnt TEXT %s" /* Filename of same file on target version */ |
| 231 | ");", |
| 232 | filename_collation(), filename_collation() |
| 233 | ); |
| 234 | |
| @@ -400,11 +400,11 @@ | |
| 400 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 401 | }else if( idt>0 && idv>0 && ridt!=ridv && (chnged==0 || deleted) ){ |
| 402 | /* The file is unedited. Change it to the target version */ |
| 403 | undo_save(zName); |
| 404 | if( deleted ){ |
| 405 | fossil_print("UPDATE %s - change to unmanaged file\n", zName); |
| 406 | }else{ |
| 407 | fossil_print("UPDATE %s\n", zName); |
| 408 | } |
| 409 | if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0); |
| 410 | }else if( idt>0 && idv>0 && file_wd_size(zFullPath)<0 ){ |
| 411 |