Fossil SCM
When a file has been deleted on the current branch and edited on a separate branch, bring in the edited version of the file when merging from the separate branch.
Commit
0df5249d51b9c49ae323602a04c11590dff5dea4
Parent
051d0abaacc8b5e…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -783,11 +783,11 @@ | ||
| 783 | 783 | while( db_step(&q)==SQLITE_ROW ){ |
| 784 | 784 | int idm = db_column_int(&q, 0); |
| 785 | 785 | const char *zName; |
| 786 | 786 | char *zFullName; |
| 787 | 787 | db_multi_exec( |
| 788 | - "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" | |
| 788 | + "REPLACE INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" | |
| 789 | 789 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 790 | 790 | vid, integrateFlag?5:3, idm |
| 791 | 791 | ); |
| 792 | 792 | zName = db_column_text(&q, 1); |
| 793 | 793 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 794 | 794 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -783,11 +783,11 @@ | |
| 783 | while( db_step(&q)==SQLITE_ROW ){ |
| 784 | int idm = db_column_int(&q, 0); |
| 785 | const char *zName; |
| 786 | char *zFullName; |
| 787 | db_multi_exec( |
| 788 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 789 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 790 | vid, integrateFlag?5:3, idm |
| 791 | ); |
| 792 | zName = db_column_text(&q, 1); |
| 793 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 794 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -783,11 +783,11 @@ | |
| 783 | while( db_step(&q)==SQLITE_ROW ){ |
| 784 | int idm = db_column_int(&q, 0); |
| 785 | const char *zName; |
| 786 | char *zFullName; |
| 787 | db_multi_exec( |
| 788 | "REPLACE INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 789 | " SELECT %d,%d,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 790 | vid, integrateFlag?5:3, idm |
| 791 | ); |
| 792 | zName = db_column_text(&q, 1); |
| 793 | zFullName = mprintf("%s%s", g.zLocalRoot, zName); |
| 794 |