Fossil

Diff
Login

Differences From Artifact [33d697fa7e]:

To Artifact [91be8a44c0]:


1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
    for(i=0, pParentFile=pParent->aFile; i<pParent->nFile; i++, pParentFile++){
      pChildFile = manifest_file_seek(pChild, pParentFile->zName);
      if( pChildFile ){
        int mperm = manifest_file_mperm(pChildFile);
        if( !pParentFile->zUuid ){
          /* File added to the child */
          add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0,
              isPublic, manifest_file_mperm(pChildFile));
        }else if( fossil_strcmp(pChildFile->zUuid, pParentFile->zUuid) !=0
            || manifest_file_mperm(pChildFile)!=mperm ){
          /* File changed in the child back to the baseline uuid or perms */
          add_one_mlink(cid, pParentFile->zUuid, pChildFile->zUuid,
              pChildFile->zName, 0, isPublic, mperm);
        }
      }
    }
  }else if( pChild->zBaseline==0 ){







|

|







1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
    for(i=0, pParentFile=pParent->aFile; i<pParent->nFile; i++, pParentFile++){
      pChildFile = manifest_file_seek(pChild, pParentFile->zName);
      if( pChildFile ){
        int mperm = manifest_file_mperm(pChildFile);
        if( !pParentFile->zUuid ){
          /* File added to the child */
          add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0,
              isPublic, mperm);
        }else if( fossil_strcmp(pChildFile->zUuid, pParentFile->zUuid) !=0
            || manifest_file_mperm(pParentFile)!=mperm ){
          /* File changed in the child back to the baseline uuid or perms */
          add_one_mlink(cid, pParentFile->zUuid, pChildFile->zUuid,
              pChildFile->zName, 0, isPublic, mperm);
        }
      }
    }
  }else if( pChild->zBaseline==0 ){