Fossil SCM
Fix a missing \n on the trace output of the previous check-in. Also fix a redundancy in the computation of symbolic links.
Commit
597176786b9a8aa9ab245a8732bb19e6ed22d009
Parent
21acce3c350f582…
1 file changed
+1
-12
+1
-12
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -267,29 +267,18 @@ | ||
| 267 | 267 | " islinkm=coalesce((SELECT islink FROM vfile" |
| 268 | 268 | " WHERE vid=%d AND pathname=fnm),0)", |
| 269 | 269 | pid, pid, mid, mid, vid, mid |
| 270 | 270 | ); |
| 271 | 271 | |
| 272 | - /* | |
| 273 | - ** Add islink information for files in V and M | |
| 274 | - ** | |
| 275 | - */ | |
| 276 | - db_multi_exec( | |
| 277 | - "UPDATE fv SET" | |
| 278 | - " islinkv=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnm),0)," | |
| 279 | - " islinkm=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnm),0)", | |
| 280 | - vid, mid | |
| 281 | - ); | |
| 282 | - | |
| 283 | 272 | if( debugFlag ){ |
| 284 | 273 | db_prepare(&q, |
| 285 | 274 | "SELECT rowid, fn, fnp, fnm, chnged, ridv, ridp, ridm, " |
| 286 | 275 | " isexe, islinkv, islinkm FROM fv" |
| 287 | 276 | ); |
| 288 | 277 | while( db_step(&q)==SQLITE_ROW ){ |
| 289 | 278 | fossil_print("%3d: ridv=%-4d ridp=%-4d ridm=%-4d chnged=%d isexe=%d " |
| 290 | - " islinkv=%d islinkm=%d", | |
| 279 | + " islinkv=%d islinkm=%d\n", | |
| 291 | 280 | db_column_int(&q, 0), |
| 292 | 281 | db_column_int(&q, 5), |
| 293 | 282 | db_column_int(&q, 6), |
| 294 | 283 | db_column_int(&q, 7), |
| 295 | 284 | db_column_int(&q, 4), |
| 296 | 285 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -267,29 +267,18 @@ | |
| 267 | " islinkm=coalesce((SELECT islink FROM vfile" |
| 268 | " WHERE vid=%d AND pathname=fnm),0)", |
| 269 | pid, pid, mid, mid, vid, mid |
| 270 | ); |
| 271 | |
| 272 | /* |
| 273 | ** Add islink information for files in V and M |
| 274 | ** |
| 275 | */ |
| 276 | db_multi_exec( |
| 277 | "UPDATE fv SET" |
| 278 | " islinkv=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnm),0)," |
| 279 | " islinkm=coalesce((SELECT islink FROM vfile WHERE vid=%d AND pathname=fnm),0)", |
| 280 | vid, mid |
| 281 | ); |
| 282 | |
| 283 | if( debugFlag ){ |
| 284 | db_prepare(&q, |
| 285 | "SELECT rowid, fn, fnp, fnm, chnged, ridv, ridp, ridm, " |
| 286 | " isexe, islinkv, islinkm FROM fv" |
| 287 | ); |
| 288 | while( db_step(&q)==SQLITE_ROW ){ |
| 289 | fossil_print("%3d: ridv=%-4d ridp=%-4d ridm=%-4d chnged=%d isexe=%d " |
| 290 | " islinkv=%d islinkm=%d", |
| 291 | db_column_int(&q, 0), |
| 292 | db_column_int(&q, 5), |
| 293 | db_column_int(&q, 6), |
| 294 | db_column_int(&q, 7), |
| 295 | db_column_int(&q, 4), |
| 296 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -267,29 +267,18 @@ | |
| 267 | " islinkm=coalesce((SELECT islink FROM vfile" |
| 268 | " WHERE vid=%d AND pathname=fnm),0)", |
| 269 | pid, pid, mid, mid, vid, mid |
| 270 | ); |
| 271 | |
| 272 | if( debugFlag ){ |
| 273 | db_prepare(&q, |
| 274 | "SELECT rowid, fn, fnp, fnm, chnged, ridv, ridp, ridm, " |
| 275 | " isexe, islinkv, islinkm FROM fv" |
| 276 | ); |
| 277 | while( db_step(&q)==SQLITE_ROW ){ |
| 278 | fossil_print("%3d: ridv=%-4d ridp=%-4d ridm=%-4d chnged=%d isexe=%d " |
| 279 | " islinkv=%d islinkm=%d\n", |
| 280 | db_column_int(&q, 0), |
| 281 | db_column_int(&q, 5), |
| 282 | db_column_int(&q, 6), |
| 283 | db_column_int(&q, 7), |
| 284 | db_column_int(&q, 4), |
| 285 |