Fossil SCM

The revision numbers in the annotate output were off by one check-in. This changes should fix the problem.

drh 2017-09-26 20:41 trunk
Commit 0b4c3f5a2809379193c7852fbd261060b0d5fe4deebd2b32ed1d1c4d3e313b99
1 file changed +1 -1
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -2319,17 +2319,17 @@
23192319
p->aVers = fossil_realloc(p->aVers, (p->nVers+1)*sizeof(p->aVers[0]));
23202320
p->aVers[p->nVers].zFUuid = fossil_strdup(db_column_text(&q, 0));
23212321
p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
23222322
p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
23232323
p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2324
- p->nVers++;
23252324
if( cnt>0 ){
23262325
content_get(rid, &step);
23272326
blob_to_utf8_no_bom(&step, 0);
23282327
annotation_step(p, &step, p->nVers-1, annFlags);
23292328
blob_reset(&step);
23302329
}
2330
+ p->nVers++;
23312331
cnt++;
23322332
}
23332333
db_finalize(&q);
23342334
db_end_transaction(0);
23352335
}
23362336
--- src/diff.c
+++ src/diff.c
@@ -2319,17 +2319,17 @@
2319 p->aVers = fossil_realloc(p->aVers, (p->nVers+1)*sizeof(p->aVers[0]));
2320 p->aVers[p->nVers].zFUuid = fossil_strdup(db_column_text(&q, 0));
2321 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2322 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2323 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2324 p->nVers++;
2325 if( cnt>0 ){
2326 content_get(rid, &step);
2327 blob_to_utf8_no_bom(&step, 0);
2328 annotation_step(p, &step, p->nVers-1, annFlags);
2329 blob_reset(&step);
2330 }
 
2331 cnt++;
2332 }
2333 db_finalize(&q);
2334 db_end_transaction(0);
2335 }
2336
--- src/diff.c
+++ src/diff.c
@@ -2319,17 +2319,17 @@
2319 p->aVers = fossil_realloc(p->aVers, (p->nVers+1)*sizeof(p->aVers[0]));
2320 p->aVers[p->nVers].zFUuid = fossil_strdup(db_column_text(&q, 0));
2321 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2322 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2323 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
 
2324 if( cnt>0 ){
2325 content_get(rid, &step);
2326 blob_to_utf8_no_bom(&step, 0);
2327 annotation_step(p, &step, p->nVers-1, annFlags);
2328 blob_reset(&step);
2329 }
2330 p->nVers++;
2331 cnt++;
2332 }
2333 db_finalize(&q);
2334 db_end_transaction(0);
2335 }
2336

Keyboard Shortcuts

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