Fossil SCM
Fix an error in the sync logic introduced by check-in [50a7f89a77e0886f]. If you build a version of fossil starting with check-in [50a7f89a77e0886f] up to but not including this one, it might not sync all of the latest changes.
Commit
b517a989d61772c2556ac2568f092bf5f3e19166b516cb206ad15f2e63b190be
Parent
64bc064df94d20b…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -2258,11 +2258,11 @@ | ||
| 2258 | 2258 | if( isPriv ){ |
| 2259 | 2259 | content_make_private(rid); |
| 2260 | 2260 | }else{ |
| 2261 | 2261 | content_make_public(rid); |
| 2262 | 2262 | } |
| 2263 | - }else if( !g.perm.Private ){ | |
| 2263 | + }else if( isPriv && !g.perm.Private ){ | |
| 2264 | 2264 | /* ignore private files */ |
| 2265 | 2265 | }else if( (syncFlags & (SYNC_PULL|SYNC_CLONE))!=0 ){ |
| 2266 | 2266 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 2267 | 2267 | if( rid ) newPhantom = 1; |
| 2268 | 2268 | } |
| 2269 | 2269 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2258,11 +2258,11 @@ | |
| 2258 | if( isPriv ){ |
| 2259 | content_make_private(rid); |
| 2260 | }else{ |
| 2261 | content_make_public(rid); |
| 2262 | } |
| 2263 | }else if( !g.perm.Private ){ |
| 2264 | /* ignore private files */ |
| 2265 | }else if( (syncFlags & (SYNC_PULL|SYNC_CLONE))!=0 ){ |
| 2266 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 2267 | if( rid ) newPhantom = 1; |
| 2268 | } |
| 2269 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2258,11 +2258,11 @@ | |
| 2258 | if( isPriv ){ |
| 2259 | content_make_private(rid); |
| 2260 | }else{ |
| 2261 | content_make_public(rid); |
| 2262 | } |
| 2263 | }else if( isPriv && !g.perm.Private ){ |
| 2264 | /* ignore private files */ |
| 2265 | }else if( (syncFlags & (SYNC_PULL|SYNC_CLONE))!=0 ){ |
| 2266 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 2267 | if( rid ) newPhantom = 1; |
| 2268 | } |
| 2269 |