Fossil SCM
Bug fix for large syncs involving delta-manifests.
Commit
8837795f538df01daaae09e9544f7a4f8e2f3810
Parent
abe892304a60f9e…
1 file changed
+1
-1
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -946,11 +946,11 @@ | ||
| 946 | 946 | ); |
| 947 | 947 | return 1; |
| 948 | 948 | } |
| 949 | 949 | p->pBaseline = manifest_get(rid, CFTYPE_MANIFEST); |
| 950 | 950 | if( p->pBaseline==0 ){ |
| 951 | - if( !throwError && db_exists("SELECT 1 FROM phantom WHERE rid=%d",rid) ){ | |
| 951 | + if( !throwError ){ | |
| 952 | 952 | db_multi_exec( |
| 953 | 953 | "INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)", |
| 954 | 954 | rid, p->rid |
| 955 | 955 | ); |
| 956 | 956 | return 1; |
| 957 | 957 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -946,11 +946,11 @@ | |
| 946 | ); |
| 947 | return 1; |
| 948 | } |
| 949 | p->pBaseline = manifest_get(rid, CFTYPE_MANIFEST); |
| 950 | if( p->pBaseline==0 ){ |
| 951 | if( !throwError && db_exists("SELECT 1 FROM phantom WHERE rid=%d",rid) ){ |
| 952 | db_multi_exec( |
| 953 | "INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)", |
| 954 | rid, p->rid |
| 955 | ); |
| 956 | return 1; |
| 957 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -946,11 +946,11 @@ | |
| 946 | ); |
| 947 | return 1; |
| 948 | } |
| 949 | p->pBaseline = manifest_get(rid, CFTYPE_MANIFEST); |
| 950 | if( p->pBaseline==0 ){ |
| 951 | if( !throwError ){ |
| 952 | db_multi_exec( |
| 953 | "INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)", |
| 954 | rid, p->rid |
| 955 | ); |
| 956 | return 1; |
| 957 |