Fossil SCM
When undoing a purge, make sure to also unshun all resurrected elements.
Commit
454c727154772c6dabe4edde9273068fb3029e05
Parent
353bfbacb9d20c3…
1 file changed
+5
+5
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -508,10 +508,15 @@ | ||
| 508 | 508 | ");" |
| 509 | 509 | "CREATE INDEX ixsrcid ON ix(srcid);" |
| 510 | 510 | "INSERT INTO ix(piid,srcid) " |
| 511 | 511 | " SELECT piid, coalesce(srcid,0) FROM purgeitem WHERE peid=%d;", |
| 512 | 512 | peid |
| 513 | + ); | |
| 514 | + db_multi_exec( | |
| 515 | + "DELETE FROM shun" | |
| 516 | + " WHERE uuid IN (SELECT uuid FROM purgeitem WHERE peid=%d);", | |
| 517 | + peid | |
| 513 | 518 | ); |
| 514 | 519 | manifest_crosslink_begin(); |
| 515 | 520 | purge_item_resurrect(0, 0); |
| 516 | 521 | manifest_crosslink_end(0); |
| 517 | 522 | db_multi_exec("DELETE FROM purgeevent WHERE peid=%d", peid); |
| 518 | 523 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -508,10 +508,15 @@ | |
| 508 | ");" |
| 509 | "CREATE INDEX ixsrcid ON ix(srcid);" |
| 510 | "INSERT INTO ix(piid,srcid) " |
| 511 | " SELECT piid, coalesce(srcid,0) FROM purgeitem WHERE peid=%d;", |
| 512 | peid |
| 513 | ); |
| 514 | manifest_crosslink_begin(); |
| 515 | purge_item_resurrect(0, 0); |
| 516 | manifest_crosslink_end(0); |
| 517 | db_multi_exec("DELETE FROM purgeevent WHERE peid=%d", peid); |
| 518 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -508,10 +508,15 @@ | |
| 508 | ");" |
| 509 | "CREATE INDEX ixsrcid ON ix(srcid);" |
| 510 | "INSERT INTO ix(piid,srcid) " |
| 511 | " SELECT piid, coalesce(srcid,0) FROM purgeitem WHERE peid=%d;", |
| 512 | peid |
| 513 | ); |
| 514 | db_multi_exec( |
| 515 | "DELETE FROM shun" |
| 516 | " WHERE uuid IN (SELECT uuid FROM purgeitem WHERE peid=%d);", |
| 517 | peid |
| 518 | ); |
| 519 | manifest_crosslink_begin(); |
| 520 | purge_item_resurrect(0, 0); |
| 521 | manifest_crosslink_end(0); |
| 522 | db_multi_exec("DELETE FROM purgeevent WHERE peid=%d", peid); |
| 523 |