Fossil SCM
Fix private content push bug mentioned on Forum. It's possible that this content has already been recorded as private so ignore unique constraint error.
Commit
82aded4cff95dd74078209baabbb68bde9d4a89488e66f41034e3d8c4102cc96
Parent
cbc21e52904aac6…
1 file changed
+1
-1
+1
-1
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -598,11 +598,11 @@ | ||
| 598 | 598 | if( !pBlob ){ |
| 599 | 599 | db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid); |
| 600 | 600 | } |
| 601 | 601 | } |
| 602 | 602 | if( g.markPrivate || isPrivate ){ |
| 603 | - db_multi_exec("INSERT INTO private VALUES(%d)", rid); | |
| 603 | + db_multi_exec("INSERT OR IGNORE INTO private VALUES(%d)", rid); | |
| 604 | 604 | markAsUnclustered = 0; |
| 605 | 605 | } |
| 606 | 606 | if( nBlob==0 ) blob_reset(&cmpr); |
| 607 | 607 | |
| 608 | 608 | /* If the srcId is specified, then the data we just added is |
| 609 | 609 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -598,11 +598,11 @@ | |
| 598 | if( !pBlob ){ |
| 599 | db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid); |
| 600 | } |
| 601 | } |
| 602 | if( g.markPrivate || isPrivate ){ |
| 603 | db_multi_exec("INSERT INTO private VALUES(%d)", rid); |
| 604 | markAsUnclustered = 0; |
| 605 | } |
| 606 | if( nBlob==0 ) blob_reset(&cmpr); |
| 607 | |
| 608 | /* If the srcId is specified, then the data we just added is |
| 609 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -598,11 +598,11 @@ | |
| 598 | if( !pBlob ){ |
| 599 | db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid); |
| 600 | } |
| 601 | } |
| 602 | if( g.markPrivate || isPrivate ){ |
| 603 | db_multi_exec("INSERT OR IGNORE INTO private VALUES(%d)", rid); |
| 604 | markAsUnclustered = 0; |
| 605 | } |
| 606 | if( nBlob==0 ) blob_reset(&cmpr); |
| 607 | |
| 608 | /* If the srcId is specified, then the data we just added is |
| 609 |