Fossil

Check-in [b517a989d6]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b517a989d61772c2556ac2568f092bf5f3e19166b516cb206ad15f2e63b190be
User & Date: drh 2020-04-14 02:23:17
Context
2020-04-14
03:04
Minor documentation tweaks. check-in: a3c5ce63cf user: drh tags: trunk
02:23
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. check-in: b517a989d6 user: drh tags: trunk
02:15
Fix the mkversion.c routine so that it works with timestamps that have a leading zero. check-in: 64bc064df9 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/xfer.c.

2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
        rid = rid_from_uuid(&xfer.aToken[1], 0, 0);
        if( rid>0 ){
          if( isPriv ){
            content_make_private(rid);
          }else{
            content_make_public(rid);
          }
        }else if( !g.perm.Private ){
          /* ignore private files */
        }else if( (syncFlags & (SYNC_PULL|SYNC_CLONE))!=0 ){
          rid = content_new(blob_str(&xfer.aToken[1]), isPriv);
          if( rid ) newPhantom = 1;
        }
        remote_has(rid);
      }else







|







2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
        rid = rid_from_uuid(&xfer.aToken[1], 0, 0);
        if( rid>0 ){
          if( isPriv ){
            content_make_private(rid);
          }else{
            content_make_public(rid);
          }
        }else if( isPriv && !g.perm.Private ){
          /* ignore private files */
        }else if( (syncFlags & (SYNC_PULL|SYNC_CLONE))!=0 ){
          rid = content_new(blob_str(&xfer.aToken[1]), isPriv);
          if( rid ) newPhantom = 1;
        }
        remote_has(rid);
      }else