Fossil SCM

Use delta encoding between baseline manifests separated by delta manifests.

drh 2010-10-27 11:54 trunk
Commit e21ca81e1a76f98f2b3d5b5a7124e35e6b718920
1 file changed +3
--- src/manifest.c
+++ src/manifest.c
@@ -1184,10 +1184,13 @@
11841184
*ppOther = manifest_parse(&otherContent, otherRid);
11851185
if( *ppOther==0 ) return;
11861186
}
11871187
if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
11881188
content_deltify(pid, cid, 0);
1189
+ }else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){
1190
+ fetch_baseline(pParent);
1191
+ content_deltify(pParent->pBaseline->rid, cid, 0);
11891192
}
11901193
11911194
for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
11921195
if( pChildFile->zPrior ){
11931196
pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
11941197
--- src/manifest.c
+++ src/manifest.c
@@ -1184,10 +1184,13 @@
1184 *ppOther = manifest_parse(&otherContent, otherRid);
1185 if( *ppOther==0 ) return;
1186 }
1187 if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
1188 content_deltify(pid, cid, 0);
 
 
 
1189 }
1190
1191 for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
1192 if( pChildFile->zPrior ){
1193 pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
1194
--- src/manifest.c
+++ src/manifest.c
@@ -1184,10 +1184,13 @@
1184 *ppOther = manifest_parse(&otherContent, otherRid);
1185 if( *ppOther==0 ) return;
1186 }
1187 if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
1188 content_deltify(pid, cid, 0);
1189 }else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){
1190 fetch_baseline(pParent);
1191 content_deltify(pParent->pBaseline->rid, cid, 0);
1192 }
1193
1194 for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
1195 if( pChildFile->zPrior ){
1196 pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
1197

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button