Fossil SCM
Fix the forbid-delta-manifest setting so that it actually works.
Commit
6ed036f287235a576db28d8570a4dd21daa52804ee3856c93a89c176be2f52aa
Parent
896aa056498a86a…
1 file changed
+4
-3
+4
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2238,14 +2238,15 @@ | ||
| 2238 | 2238 | /* So that older versions of Fossil (that do not understand delta- |
| 2239 | 2239 | ** manifest) can continue to use this repository, do not create a new |
| 2240 | 2240 | ** delta-manifest unless this repository already contains one or more |
| 2241 | 2241 | ** delta-manifests, or unless the delta-manifest is explicitly requested |
| 2242 | 2242 | ** by the --delta option. |
| 2243 | + ** | |
| 2244 | + ** The forbid-delta-manifests setting prevents new delta manifests. | |
| 2243 | 2245 | */ |
| 2244 | - if( !forceDelta | |
| 2245 | - && !db_get_boolean("seen-delta-manifest",0) | |
| 2246 | - && !db_get_boolean("forbid-delta-manifests",0) | |
| 2246 | + if( (!forceDelta && !db_get_boolean("seen-delta-manifest",0)) | |
| 2247 | + || db_get_boolean("forbid-delta-manifests",0) | |
| 2247 | 2248 | ){ |
| 2248 | 2249 | forceBaseline = 1; |
| 2249 | 2250 | } |
| 2250 | 2251 | |
| 2251 | 2252 | /* |
| 2252 | 2253 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2238,14 +2238,15 @@ | |
| 2238 | /* So that older versions of Fossil (that do not understand delta- |
| 2239 | ** manifest) can continue to use this repository, do not create a new |
| 2240 | ** delta-manifest unless this repository already contains one or more |
| 2241 | ** delta-manifests, or unless the delta-manifest is explicitly requested |
| 2242 | ** by the --delta option. |
| 2243 | */ |
| 2244 | if( !forceDelta |
| 2245 | && !db_get_boolean("seen-delta-manifest",0) |
| 2246 | && !db_get_boolean("forbid-delta-manifests",0) |
| 2247 | ){ |
| 2248 | forceBaseline = 1; |
| 2249 | } |
| 2250 | |
| 2251 | /* |
| 2252 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2238,14 +2238,15 @@ | |
| 2238 | /* So that older versions of Fossil (that do not understand delta- |
| 2239 | ** manifest) can continue to use this repository, do not create a new |
| 2240 | ** delta-manifest unless this repository already contains one or more |
| 2241 | ** delta-manifests, or unless the delta-manifest is explicitly requested |
| 2242 | ** by the --delta option. |
| 2243 | ** |
| 2244 | ** The forbid-delta-manifests setting prevents new delta manifests. |
| 2245 | */ |
| 2246 | if( (!forceDelta && !db_get_boolean("seen-delta-manifest",0)) |
| 2247 | || db_get_boolean("forbid-delta-manifests",0) |
| 2248 | ){ |
| 2249 | forceBaseline = 1; |
| 2250 | } |
| 2251 | |
| 2252 | /* |
| 2253 |