Fossil SCM
Remove unnecessary code.
Commit
c8421e923c6e9e72282e27b7e62c98e414678faa
Parent
1385c8d456a4b26…
1 file changed
+2
-6
+2
-6
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -753,27 +753,23 @@ | ||
| 753 | 753 | |
| 754 | 754 | /* |
| 755 | 755 | ** Add to V files that are not in V or P but are in M |
| 756 | 756 | */ |
| 757 | 757 | db_prepare(&q, |
| 758 | - "SELECT idm, rowid, fnm FROM fv" | |
| 758 | + "SELECT idm, fnm FROM fv" | |
| 759 | 759 | " WHERE idp=0 AND idv=0 AND idm>0" |
| 760 | 760 | ); |
| 761 | 761 | while( db_step(&q)==SQLITE_ROW ){ |
| 762 | 762 | int idm = db_column_int(&q, 0); |
| 763 | - int rowid = db_column_int(&q, 1); | |
| 764 | - int idv; | |
| 765 | 763 | const char *zName; |
| 766 | 764 | char *zFullName; |
| 767 | 765 | db_multi_exec( |
| 768 | 766 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 769 | 767 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 770 | 768 | vid, integrateFlag?5:3, idm |
| 771 | 769 | ); |
| 772 | - idv = db_last_insert_rowid(); | |
| 773 | - db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); | |
| 774 | - zName = db_column_text(&q, 2); | |
| 770 | + zName = db_column_text(&q, 1); | |
| 775 | 771 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 776 | 772 | if( file_wd_isfile_or_link(zFullName) |
| 777 | 773 | && !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){ |
| 778 | 774 | fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName); |
| 779 | 775 | nOverwrite++; |
| 780 | 776 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -753,27 +753,23 @@ | |
| 753 | |
| 754 | /* |
| 755 | ** Add to V files that are not in V or P but are in M |
| 756 | */ |
| 757 | db_prepare(&q, |
| 758 | "SELECT idm, rowid, fnm FROM fv" |
| 759 | " WHERE idp=0 AND idv=0 AND idm>0" |
| 760 | ); |
| 761 | while( db_step(&q)==SQLITE_ROW ){ |
| 762 | int idm = db_column_int(&q, 0); |
| 763 | int rowid = db_column_int(&q, 1); |
| 764 | int idv; |
| 765 | const char *zName; |
| 766 | char *zFullName; |
| 767 | db_multi_exec( |
| 768 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 769 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 770 | vid, integrateFlag?5:3, idm |
| 771 | ); |
| 772 | idv = db_last_insert_rowid(); |
| 773 | db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); |
| 774 | zName = db_column_text(&q, 2); |
| 775 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 776 | if( file_wd_isfile_or_link(zFullName) |
| 777 | && !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){ |
| 778 | fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName); |
| 779 | nOverwrite++; |
| 780 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -753,27 +753,23 @@ | |
| 753 | |
| 754 | /* |
| 755 | ** Add to V files that are not in V or P but are in M |
| 756 | */ |
| 757 | db_prepare(&q, |
| 758 | "SELECT idm, fnm FROM fv" |
| 759 | " WHERE idp=0 AND idv=0 AND idm>0" |
| 760 | ); |
| 761 | while( db_step(&q)==SQLITE_ROW ){ |
| 762 | int idm = db_column_int(&q, 0); |
| 763 | const char *zName; |
| 764 | char *zFullName; |
| 765 | db_multi_exec( |
| 766 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 767 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 768 | vid, integrateFlag?5:3, idm |
| 769 | ); |
| 770 | zName = db_column_text(&q, 1); |
| 771 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 772 | if( file_wd_isfile_or_link(zFullName) |
| 773 | && !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){ |
| 774 | fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName); |
| 775 | nOverwrite++; |
| 776 |