Fossil SCM
Fix a very minor memory leak in the merge logic.
Commit
6ff817d3c7bd46e6cbf2a07e25f7f0b7f712559e11ff5175c627d1830cf67f68
Parent
546cbce277f90de…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -1207,11 +1207,11 @@ | ||
| 1207 | 1207 | ** of M and V is an empty file. In this case, merge conflict marks will be |
| 1208 | 1208 | ** added to the file and user will be forced to take a decision. |
| 1209 | 1209 | */ |
| 1210 | 1210 | db_prepare(&q, |
| 1211 | 1211 | /* 0 1 2 3 4 5 6 7 8 */ |
| 1212 | - "SELECT ridm, idv, ridp, ridv, %s, fn, isexe, islinkv, islinkm," | |
| 1212 | + "SELECT ridm, idv, ridp, ridv, %z, fn, isexe, islinkv, islinkm," | |
| 1213 | 1213 | /* 9 10 11 */ |
| 1214 | 1214 | " fnp, fnm, chnged" |
| 1215 | 1215 | " FROM fv" |
| 1216 | 1216 | " WHERE idv>0 AND idm>0" |
| 1217 | 1217 | " AND ridm!=ridp AND (ridv!=ridp OR chnged)", |
| 1218 | 1218 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1207,11 +1207,11 @@ | |
| 1207 | ** of M and V is an empty file. In this case, merge conflict marks will be |
| 1208 | ** added to the file and user will be forced to take a decision. |
| 1209 | */ |
| 1210 | db_prepare(&q, |
| 1211 | /* 0 1 2 3 4 5 6 7 8 */ |
| 1212 | "SELECT ridm, idv, ridp, ridv, %s, fn, isexe, islinkv, islinkm," |
| 1213 | /* 9 10 11 */ |
| 1214 | " fnp, fnm, chnged" |
| 1215 | " FROM fv" |
| 1216 | " WHERE idv>0 AND idm>0" |
| 1217 | " AND ridm!=ridp AND (ridv!=ridp OR chnged)", |
| 1218 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1207,11 +1207,11 @@ | |
| 1207 | ** of M and V is an empty file. In this case, merge conflict marks will be |
| 1208 | ** added to the file and user will be forced to take a decision. |
| 1209 | */ |
| 1210 | db_prepare(&q, |
| 1211 | /* 0 1 2 3 4 5 6 7 8 */ |
| 1212 | "SELECT ridm, idv, ridp, ridv, %z, fn, isexe, islinkv, islinkm," |
| 1213 | /* 9 10 11 */ |
| 1214 | " fnp, fnm, chnged" |
| 1215 | " FROM fv" |
| 1216 | " WHERE idv>0 AND idm>0" |
| 1217 | " AND ridm!=ridp AND (ridv!=ridp OR chnged)", |
| 1218 |