Fossil SCM
Bug fix in the mlink table builder. Use the "rebuild" method to correct the problem in preexisting repositories.
Commit
5b58559c0c35cd87d9f15f18a15a20b014319bdb
Parent
ce825ac9546eb54…
1 file changed
+1
-1
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -258,11 +258,11 @@ | ||
| 258 | 258 | content_get(cid, &otherContent); |
| 259 | 259 | } |
| 260 | 260 | if( blob_size(&otherContent)==0 ) return; |
| 261 | 261 | if( manifest_parse(&other, &otherContent)==0 ) return; |
| 262 | 262 | content_deltify(pid, cid, 0); |
| 263 | - for(i=j=0; pParent->nFile<i && pChild->nFile<j; ){ | |
| 263 | + for(i=j=0; i<pParent->nFile && j<pChild->nFile; ){ | |
| 264 | 264 | int c = strcmp(pParent->aFile[i].zName, pChild->aFile[j].zName); |
| 265 | 265 | if( c<0 ){ |
| 266 | 266 | add_one_mlink(cid, pParent->aFile[i].zUuid, 0, pParent->aFile[i].zName); |
| 267 | 267 | i++; |
| 268 | 268 | }else if( c>0 ){ |
| 269 | 269 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -258,11 +258,11 @@ | |
| 258 | content_get(cid, &otherContent); |
| 259 | } |
| 260 | if( blob_size(&otherContent)==0 ) return; |
| 261 | if( manifest_parse(&other, &otherContent)==0 ) return; |
| 262 | content_deltify(pid, cid, 0); |
| 263 | for(i=j=0; pParent->nFile<i && pChild->nFile<j; ){ |
| 264 | int c = strcmp(pParent->aFile[i].zName, pChild->aFile[j].zName); |
| 265 | if( c<0 ){ |
| 266 | add_one_mlink(cid, pParent->aFile[i].zUuid, 0, pParent->aFile[i].zName); |
| 267 | i++; |
| 268 | }else if( c>0 ){ |
| 269 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -258,11 +258,11 @@ | |
| 258 | content_get(cid, &otherContent); |
| 259 | } |
| 260 | if( blob_size(&otherContent)==0 ) return; |
| 261 | if( manifest_parse(&other, &otherContent)==0 ) return; |
| 262 | content_deltify(pid, cid, 0); |
| 263 | for(i=j=0; i<pParent->nFile && j<pChild->nFile; ){ |
| 264 | int c = strcmp(pParent->aFile[i].zName, pChild->aFile[j].zName); |
| 265 | if( c<0 ){ |
| 266 | add_one_mlink(cid, pParent->aFile[i].zUuid, 0, pParent->aFile[i].zName); |
| 267 | i++; |
| 268 | }else if( c>0 ){ |
| 269 |