Fossil SCM
Two corrections from drh.
Commit
a7caf19823bfc8d0cc6aef41322c070cd3e3434b
Parent
cf5f2c4ea6cd562…
1 file changed
+2
-2
+2
-2
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1345,13 +1345,13 @@ | ||
| 1345 | 1345 | if( pChildFile ){ |
| 1346 | 1346 | int mperm = manifest_file_mperm(pChildFile); |
| 1347 | 1347 | if( !pParentFile->zUuid ){ |
| 1348 | 1348 | /* File added to the child */ |
| 1349 | 1349 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1350 | - isPublic, manifest_file_mperm(pChildFile)); | |
| 1350 | + isPublic, mperm); | |
| 1351 | 1351 | }else if( fossil_strcmp(pChildFile->zUuid, pParentFile->zUuid) !=0 |
| 1352 | - || manifest_file_mperm(pChildFile)!=mperm ){ | |
| 1352 | + || manifest_file_mperm(pParentFile)!=mperm ){ | |
| 1353 | 1353 | /* File changed in the child back to the baseline uuid or perms */ |
| 1354 | 1354 | add_one_mlink(cid, pParentFile->zUuid, pChildFile->zUuid, |
| 1355 | 1355 | pChildFile->zName, 0, isPublic, mperm); |
| 1356 | 1356 | } |
| 1357 | 1357 | } |
| 1358 | 1358 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1345,13 +1345,13 @@ | |
| 1345 | if( pChildFile ){ |
| 1346 | int mperm = manifest_file_mperm(pChildFile); |
| 1347 | if( !pParentFile->zUuid ){ |
| 1348 | /* File added to the child */ |
| 1349 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1350 | isPublic, manifest_file_mperm(pChildFile)); |
| 1351 | }else if( fossil_strcmp(pChildFile->zUuid, pParentFile->zUuid) !=0 |
| 1352 | || manifest_file_mperm(pChildFile)!=mperm ){ |
| 1353 | /* File changed in the child back to the baseline uuid or perms */ |
| 1354 | add_one_mlink(cid, pParentFile->zUuid, pChildFile->zUuid, |
| 1355 | pChildFile->zName, 0, isPublic, mperm); |
| 1356 | } |
| 1357 | } |
| 1358 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1345,13 +1345,13 @@ | |
| 1345 | if( pChildFile ){ |
| 1346 | int mperm = manifest_file_mperm(pChildFile); |
| 1347 | if( !pParentFile->zUuid ){ |
| 1348 | /* File added to the child */ |
| 1349 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1350 | isPublic, mperm); |
| 1351 | }else if( fossil_strcmp(pChildFile->zUuid, pParentFile->zUuid) !=0 |
| 1352 | || manifest_file_mperm(pParentFile)!=mperm ){ |
| 1353 | /* File changed in the child back to the baseline uuid or perms */ |
| 1354 | add_one_mlink(cid, pParentFile->zUuid, pChildFile->zUuid, |
| 1355 | pChildFile->zName, 0, isPublic, mperm); |
| 1356 | } |
| 1357 | } |
| 1358 |