Fossil SCM
Make sure deleted files are recorded in the MLINK table.
Commit
ccc2c8f65ea6d879f6c555678202024ac9b9de57
Parent
a26940c22ea353c…
1 file changed
+3
-4
+3
-4
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1323,14 +1323,13 @@ | ||
| 1323 | 1323 | if( pChildFile ){ |
| 1324 | 1324 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1325 | 1325 | isPublic, manifest_file_mperm(pChildFile)); |
| 1326 | 1326 | } |
| 1327 | 1327 | } |
| 1328 | - }else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){ | |
| 1329 | - /* Parent is a delta but pChild is a baseline. Look for files that are | |
| 1330 | - ** present in pParent but which are missing from pChild and mark them | |
| 1331 | - ** has having been deleted. */ | |
| 1328 | + }else if( pChild->zBaseline==0 ){ | |
| 1329 | + /* pChild is a baseline. Look for files that are present in pParent | |
| 1330 | + ** but are missing from pChild and mark them as having been deleted. */ | |
| 1332 | 1331 | manifest_file_rewind(pParent); |
| 1333 | 1332 | while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ |
| 1334 | 1333 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1335 | 1334 | if( pChildFile==0 && pParentFile->zUuid!=0 ){ |
| 1336 | 1335 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0, |
| 1337 | 1336 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1323,14 +1323,13 @@ | |
| 1323 | if( pChildFile ){ |
| 1324 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1325 | isPublic, manifest_file_mperm(pChildFile)); |
| 1326 | } |
| 1327 | } |
| 1328 | }else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){ |
| 1329 | /* Parent is a delta but pChild is a baseline. Look for files that are |
| 1330 | ** present in pParent but which are missing from pChild and mark them |
| 1331 | ** has having been deleted. */ |
| 1332 | manifest_file_rewind(pParent); |
| 1333 | while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ |
| 1334 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1335 | if( pChildFile==0 && pParentFile->zUuid!=0 ){ |
| 1336 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0, |
| 1337 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1323,14 +1323,13 @@ | |
| 1323 | if( pChildFile ){ |
| 1324 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0, |
| 1325 | isPublic, manifest_file_mperm(pChildFile)); |
| 1326 | } |
| 1327 | } |
| 1328 | }else if( pChild->zBaseline==0 ){ |
| 1329 | /* pChild is a baseline. Look for files that are present in pParent |
| 1330 | ** but are missing from pChild and mark them as having been deleted. */ |
| 1331 | manifest_file_rewind(pParent); |
| 1332 | while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ |
| 1333 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1334 | if( pChildFile==0 && pParentFile->zUuid!=0 ){ |
| 1335 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0, |
| 1336 |