Fossil SCM
If the child manifest is a baseline and the parent a delta manifest, files that are marked as removed in the parent have to be skipped. This fixes "Added XXX version []" entries in the UI.
Commit
91472616bfe48baca3f12bf0a45b25f9413868a2
Parent
518ec9dd9f1a892…
1 file changed
+1
-1
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1330,11 +1330,11 @@ | ||
| 1330 | 1330 | ** present in pParent but which are missing from pChild and mark them |
| 1331 | 1331 | ** has having been deleted. */ |
| 1332 | 1332 | manifest_file_rewind(pParent); |
| 1333 | 1333 | while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ |
| 1334 | 1334 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1335 | - if( pChildFile==0 ){ | |
| 1335 | + if( pChildFile==0 && pParentFile->zUuid!=0 ){ | |
| 1336 | 1336 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0, |
| 1337 | 1337 | isPublic, 0); |
| 1338 | 1338 | } |
| 1339 | 1339 | } |
| 1340 | 1340 | } |
| 1341 | 1341 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1330,11 +1330,11 @@ | |
| 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 ){ |
| 1336 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0, |
| 1337 | isPublic, 0); |
| 1338 | } |
| 1339 | } |
| 1340 | } |
| 1341 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1330,11 +1330,11 @@ | |
| 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 | isPublic, 0); |
| 1338 | } |
| 1339 | } |
| 1340 | } |
| 1341 |