Fossil SCM
Backout [636982a564], which incorrectly calculates aggregate disk checksums when selectively committing files for the initial checkin.
Commit
1a0179abd7d559cb386c571676ebba2bb00070f2
Parent
7ff74b20d6620c5…
1 file changed
+3
-3
+3
-3
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -728,11 +728,11 @@ | ||
| 728 | 728 | const char *zOrigName = db_column_text(&q, 2); |
| 729 | 729 | char zBuf[100]; |
| 730 | 730 | Blob file; |
| 731 | 731 | |
| 732 | 732 | if( zOrigName ) zName = zOrigName; |
| 733 | - if( rid>0 || vid==0 ){ | |
| 733 | + if( rid>0 ){ | |
| 734 | 734 | md5sum_step_text(zName, -1); |
| 735 | 735 | blob_zero(&file); |
| 736 | 736 | content_get(rid, &file); |
| 737 | 737 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 738 | 738 | md5sum_step_text(zBuf, -1); |
| @@ -837,13 +837,13 @@ | ||
| 837 | 837 | db_must_be_within_tree(); |
| 838 | 838 | |
| 839 | 839 | db_prepare(&q, "SELECT pathname, origname, rid, is_selected(id)" |
| 840 | 840 | " FROM vfile" |
| 841 | 841 | " WHERE (NOT deleted OR NOT is_selected(id))" |
| 842 | - " %s AND vid=%d" | |
| 842 | + " AND rid>0 AND vid=%d" | |
| 843 | 843 | " ORDER BY if_selected(id,pathname,origname) /*scan*/", |
| 844 | - (vid ? "AND rid>0" : ""), vid); | |
| 844 | + vid); | |
| 845 | 845 | blob_zero(&file); |
| 846 | 846 | md5sum_init(); |
| 847 | 847 | while( db_step(&q)==SQLITE_ROW ){ |
| 848 | 848 | const char *zName = db_column_text(&q, 0); |
| 849 | 849 | const char *zOrigName = db_column_text(&q, 1); |
| 850 | 850 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -728,11 +728,11 @@ | |
| 728 | const char *zOrigName = db_column_text(&q, 2); |
| 729 | char zBuf[100]; |
| 730 | Blob file; |
| 731 | |
| 732 | if( zOrigName ) zName = zOrigName; |
| 733 | if( rid>0 || vid==0 ){ |
| 734 | md5sum_step_text(zName, -1); |
| 735 | blob_zero(&file); |
| 736 | content_get(rid, &file); |
| 737 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 738 | md5sum_step_text(zBuf, -1); |
| @@ -837,13 +837,13 @@ | |
| 837 | db_must_be_within_tree(); |
| 838 | |
| 839 | db_prepare(&q, "SELECT pathname, origname, rid, is_selected(id)" |
| 840 | " FROM vfile" |
| 841 | " WHERE (NOT deleted OR NOT is_selected(id))" |
| 842 | " %s AND vid=%d" |
| 843 | " ORDER BY if_selected(id,pathname,origname) /*scan*/", |
| 844 | (vid ? "AND rid>0" : ""), vid); |
| 845 | blob_zero(&file); |
| 846 | md5sum_init(); |
| 847 | while( db_step(&q)==SQLITE_ROW ){ |
| 848 | const char *zName = db_column_text(&q, 0); |
| 849 | const char *zOrigName = db_column_text(&q, 1); |
| 850 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -728,11 +728,11 @@ | |
| 728 | const char *zOrigName = db_column_text(&q, 2); |
| 729 | char zBuf[100]; |
| 730 | Blob file; |
| 731 | |
| 732 | if( zOrigName ) zName = zOrigName; |
| 733 | if( rid>0 ){ |
| 734 | md5sum_step_text(zName, -1); |
| 735 | blob_zero(&file); |
| 736 | content_get(rid, &file); |
| 737 | sqlite3_snprintf(sizeof(zBuf), zBuf, " %d\n", blob_size(&file)); |
| 738 | md5sum_step_text(zBuf, -1); |
| @@ -837,13 +837,13 @@ | |
| 837 | db_must_be_within_tree(); |
| 838 | |
| 839 | db_prepare(&q, "SELECT pathname, origname, rid, is_selected(id)" |
| 840 | " FROM vfile" |
| 841 | " WHERE (NOT deleted OR NOT is_selected(id))" |
| 842 | " AND rid>0 AND vid=%d" |
| 843 | " ORDER BY if_selected(id,pathname,origname) /*scan*/", |
| 844 | vid); |
| 845 | blob_zero(&file); |
| 846 | md5sum_init(); |
| 847 | while( db_step(&q)==SQLITE_ROW ){ |
| 848 | const char *zName = db_column_text(&q, 0); |
| 849 | const char *zOrigName = db_column_text(&q, 1); |
| 850 |