Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | If a file has been "fossil rm"-ed in the local checkout - which has not been committed, then a "fossil update" is done to another version that has no changes on that file, then silently keep that file unmanaged. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2918effe0d0aaae5875d61737c943ead |
| User & Date: | drh 2013-08-26 18:23:32.354 |
Context
|
2013-08-26
| ||
| 20:08 | prevent duplicate UUID's in P-card check-in: 4f443a3e7f user: jan.nijtmans tags: trunk | |
| 18:23 | If a file has been "fossil rm"-ed in the local checkout - which has not been committed, then a "fossil update" is done to another version that has no changes on that file, then silently keep that file unmanaged. check-in: 2918effe0d user: drh tags: trunk | |
| 18:00 | Fix typos in the "fossil update" logic. check-in: 5a1d13ee50 user: drh tags: trunk | |
Changes
Changes to src/update.c.
| ︙ | ︙ | |||
403 404 405 406 407 408 409 |
undo_save(zName);
if( deleted ){
fossil_print("UPDATE %s - change to unmanaged file\n", zName);
}else{
fossil_print("UPDATE %s\n", zName);
}
if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
| | | < | 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
undo_save(zName);
if( deleted ){
fossil_print("UPDATE %s - change to unmanaged file\n", zName);
}else{
fossil_print("UPDATE %s\n", zName);
}
if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
}else if( idt>0 && idv>0 && !deleted && file_wd_size(zFullPath)<0 ){
/* The file missing from the local check-out. Restore it to the
** version that appears in the target. */
fossil_print("UPDATE %s\n", zName);
undo_save(zName);
if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
}else if( idt==0 && idv>0 ){
if( ridv==0 ){
/* Added in current checkout. Continue to hold the file as
** as an addition */
db_multi_exec("UPDATE vfile SET vid=%d WHERE id=%d", tid, idv);
|
| ︙ | ︙ |