Fossil SCM
Fix a bug in the cluster creater. The bug prevents clusters from being created correctly when there are phantom artifacts.
Commit
72959c415eded017568be2cd0dced392dc23e1df
Parent
d14adf103292442…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -430,11 +430,11 @@ | ||
| 430 | 430 | return; |
| 431 | 431 | } |
| 432 | 432 | blob_zero(&cluster); |
| 433 | 433 | db_prepare(&q, "SELECT uuid FROM unclustered, blob" |
| 434 | 434 | " WHERE NOT EXISTS(SELECT 1 FROM phantom" |
| 435 | - " WHERE rid!=unclustered.rid)" | |
| 435 | + " WHERE rid=unclustered.rid)" | |
| 436 | 436 | " AND unclustered.rid=blob.rid" |
| 437 | 437 | " AND NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" |
| 438 | 438 | " ORDER BY 1"); |
| 439 | 439 | while( db_step(&q)==SQLITE_ROW ){ |
| 440 | 440 | blob_appendf(&cluster, "M %s\n", db_column_text(&q, 0)); |
| 441 | 441 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -430,11 +430,11 @@ | |
| 430 | return; |
| 431 | } |
| 432 | blob_zero(&cluster); |
| 433 | db_prepare(&q, "SELECT uuid FROM unclustered, blob" |
| 434 | " WHERE NOT EXISTS(SELECT 1 FROM phantom" |
| 435 | " WHERE rid!=unclustered.rid)" |
| 436 | " AND unclustered.rid=blob.rid" |
| 437 | " AND NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" |
| 438 | " ORDER BY 1"); |
| 439 | while( db_step(&q)==SQLITE_ROW ){ |
| 440 | blob_appendf(&cluster, "M %s\n", db_column_text(&q, 0)); |
| 441 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -430,11 +430,11 @@ | |
| 430 | return; |
| 431 | } |
| 432 | blob_zero(&cluster); |
| 433 | db_prepare(&q, "SELECT uuid FROM unclustered, blob" |
| 434 | " WHERE NOT EXISTS(SELECT 1 FROM phantom" |
| 435 | " WHERE rid=unclustered.rid)" |
| 436 | " AND unclustered.rid=blob.rid" |
| 437 | " AND NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" |
| 438 | " ORDER BY 1"); |
| 439 | while( db_step(&q)==SQLITE_ROW ){ |
| 440 | blob_appendf(&cluster, "M %s\n", db_column_text(&q, 0)); |
| 441 |