Fossil SCM

Fixing the rebuild of the ticket databases, so they get properly the comments included by manifests' "+comment". drh says not to be able to reproduce this issue, but here is a fix that makes all work for me. Feel free to rewrite this patch to match your taste.

viriketo 2013-02-12 19:09 trunk
Commit 9cca9398ab311a4076838e65723ed7200d743747
1 file changed +3 -1
+3 -1
--- src/tkt.c
+++ src/tkt.c
@@ -210,11 +210,13 @@
210210
}
211211
aUsed = fossil_malloc( nField );
212212
memset(aUsed, 0, nField);
213213
for(i=0; i<p->nField; i++){
214214
const char *zName = p->aField[i].zName;
215
- if( (j = fieldId(zName))<0 ) continue;
215
+ if( zName[0]!='+' && (j = fieldId(zName))<0 ) continue;
216
+ if( zName[0]=='+' && (j = fieldId(zName+1))<0 )
217
+ continue;
216218
aUsed[j] = 1;
217219
if( aField[j].mUsed & USEDBY_TICKET ){
218220
if( zName[0]=='+' ){
219221
zName++;
220222
blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q",
221223
--- src/tkt.c
+++ src/tkt.c
@@ -210,11 +210,13 @@
210 }
211 aUsed = fossil_malloc( nField );
212 memset(aUsed, 0, nField);
213 for(i=0; i<p->nField; i++){
214 const char *zName = p->aField[i].zName;
215 if( (j = fieldId(zName))<0 ) continue;
 
 
216 aUsed[j] = 1;
217 if( aField[j].mUsed & USEDBY_TICKET ){
218 if( zName[0]=='+' ){
219 zName++;
220 blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q",
221
--- src/tkt.c
+++ src/tkt.c
@@ -210,11 +210,13 @@
210 }
211 aUsed = fossil_malloc( nField );
212 memset(aUsed, 0, nField);
213 for(i=0; i<p->nField; i++){
214 const char *zName = p->aField[i].zName;
215 if( zName[0]!='+' && (j = fieldId(zName))<0 ) continue;
216 if( zName[0]=='+' && (j = fieldId(zName+1))<0 )
217 continue;
218 aUsed[j] = 1;
219 if( aField[j].mUsed & USEDBY_TICKET ){
220 if( zName[0]=='+' ){
221 zName++;
222 blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q",
223

Keyboard Shortcuts

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