Fossil SCM
Typo in the previous commit.
Commit
383f8ef1ee2eccf604764afa2eaa9f5c8821501fec3d089137e79164424ec98c
Parent
a24f14900ddb50c…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -1296,11 +1296,11 @@ | ||
| 1296 | 1296 | zType = "ERROR"; |
| 1297 | 1297 | } |
| 1298 | 1298 | blob_init(&sql, 0, 0); |
| 1299 | 1299 | blob_append_sql(&sql, |
| 1300 | 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | - "VALUES(%Q,%Q,%d,%Q,iff(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", | |
| 1301 | + "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", | |
| 1302 | 1302 | /* op */ zType, |
| 1303 | 1303 | /* fnp */ zFnp, |
| 1304 | 1304 | /* ridp */ ridp, |
| 1305 | 1305 | /* fn */ zName, |
| 1306 | 1306 | /* ridv */ chnged==0, ridv, |
| 1307 | 1307 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1296,11 +1296,11 @@ | |
| 1296 | zType = "ERROR"; |
| 1297 | } |
| 1298 | blob_init(&sql, 0, 0); |
| 1299 | blob_append_sql(&sql, |
| 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | "VALUES(%Q,%Q,%d,%Q,iff(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", |
| 1302 | /* op */ zType, |
| 1303 | /* fnp */ zFnp, |
| 1304 | /* ridp */ ridp, |
| 1305 | /* fn */ zName, |
| 1306 | /* ridv */ chnged==0, ridv, |
| 1307 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1296,11 +1296,11 @@ | |
| 1296 | zType = "ERROR"; |
| 1297 | } |
| 1298 | blob_init(&sql, 0, 0); |
| 1299 | blob_append_sql(&sql, |
| 1300 | "INSERT INTO mergestat(op,fnp,ridp,fn,ridv,sz,fnm,ridm,fnr,nc,msg)" |
| 1301 | "VALUES(%Q,%Q,%d,%Q,iif(%d,%d,NULL),iif(%d,%d,NULL),%Q,%d,%Q,%d,%Q)", |
| 1302 | /* op */ zType, |
| 1303 | /* fnp */ zFnp, |
| 1304 | /* ridp */ ridp, |
| 1305 | /* fn */ zName, |
| 1306 | /* ridv */ chnged==0, ridv, |
| 1307 |