Fossil SCM
Fix the code for adding "mlink" entries so that it records file deletions on a baseline manifest.
Commit
0ba2c86d2bbd36e5126928b34b160f738149ba03
Parent
ef68b044493c768…
1 file changed
+8
+8
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1258,10 +1258,18 @@ | ||
| 1258 | 1258 | if( pParentFile->zUuid ) continue; |
| 1259 | 1259 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1260 | 1260 | if( pChildFile ){ |
| 1261 | 1261 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0); |
| 1262 | 1262 | } |
| 1263 | + } | |
| 1264 | + }else if( pChild->zBaseline==0 ){ | |
| 1265 | + manifest_file_rewind(pParent); | |
| 1266 | + while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ | |
| 1267 | + pChildFile = manifest_file_seek(pChild, pParentFile->zName); | |
| 1268 | + if( pChildFile==0 ){ | |
| 1269 | + add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0); | |
| 1270 | + } | |
| 1263 | 1271 | } |
| 1264 | 1272 | } |
| 1265 | 1273 | manifest_cache_insert(*ppOther); |
| 1266 | 1274 | } |
| 1267 | 1275 | |
| 1268 | 1276 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1258,10 +1258,18 @@ | |
| 1258 | if( pParentFile->zUuid ) continue; |
| 1259 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1260 | if( pChildFile ){ |
| 1261 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0); |
| 1262 | } |
| 1263 | } |
| 1264 | } |
| 1265 | manifest_cache_insert(*ppOther); |
| 1266 | } |
| 1267 | |
| 1268 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1258,10 +1258,18 @@ | |
| 1258 | if( pParentFile->zUuid ) continue; |
| 1259 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1260 | if( pChildFile ){ |
| 1261 | add_one_mlink(cid, 0, pChildFile->zUuid, pChildFile->zName, 0); |
| 1262 | } |
| 1263 | } |
| 1264 | }else if( pChild->zBaseline==0 ){ |
| 1265 | manifest_file_rewind(pParent); |
| 1266 | while( (pParentFile = manifest_file_next(pParent,0))!=0 ){ |
| 1267 | pChildFile = manifest_file_seek(pChild, pParentFile->zName); |
| 1268 | if( pChildFile==0 ){ |
| 1269 | add_one_mlink(cid, pParentFile->zUuid, 0, pParentFile->zName, 0); |
| 1270 | } |
| 1271 | } |
| 1272 | } |
| 1273 | manifest_cache_insert(*ppOther); |
| 1274 | } |
| 1275 | |
| 1276 |