Fossil SCM
Make sure the EVENT.OMTIME value is recorded correctly when parsing a check-in manifest.
Commit
1d83ecc5d5b05e3954957884165238cfe509986d
Parent
2fc80c21b9c1bbb…
1 file changed
+3
-3
+3
-3
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1483,25 +1483,25 @@ | ||
| 1483 | 1483 | add_one_mlink(rid, 0, p->aFile[i].zUuid, p->aFile[i].zName, 0); |
| 1484 | 1484 | } |
| 1485 | 1485 | } |
| 1486 | 1486 | db_multi_exec( |
| 1487 | 1487 | "REPLACE INTO event(type,mtime,objid,user,comment," |
| 1488 | - "bgcolor,euser,ecomment)" | |
| 1488 | + "bgcolor,euser,ecomment,omtime)" | |
| 1489 | 1489 | "VALUES('ci'," |
| 1490 | 1490 | " coalesce(" |
| 1491 | 1491 | " (SELECT julianday(value) FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1492 | 1492 | " %.17g" |
| 1493 | 1493 | " )," |
| 1494 | 1494 | " %d,%Q,%Q," |
| 1495 | 1495 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype>0)," |
| 1496 | 1496 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1497 | - " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d));", | |
| 1497 | + " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d),%.17g);", | |
| 1498 | 1498 | TAG_DATE, rid, p->rDate, |
| 1499 | 1499 | rid, p->zUser, p->zComment, |
| 1500 | 1500 | TAG_BGCOLOR, rid, |
| 1501 | 1501 | TAG_USER, rid, |
| 1502 | - TAG_COMMENT, rid | |
| 1502 | + TAG_COMMENT, rid, p->rDate | |
| 1503 | 1503 | ); |
| 1504 | 1504 | zCom = db_text(0, "SELECT coalesce(ecomment, comment) FROM event" |
| 1505 | 1505 | " WHERE rowid=last_insert_rowid()"); |
| 1506 | 1506 | wiki_extract_links(zCom, rid, 0, p->rDate, 1, WIKI_INLINE); |
| 1507 | 1507 | free(zCom); |
| 1508 | 1508 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1483,25 +1483,25 @@ | |
| 1483 | add_one_mlink(rid, 0, p->aFile[i].zUuid, p->aFile[i].zName, 0); |
| 1484 | } |
| 1485 | } |
| 1486 | db_multi_exec( |
| 1487 | "REPLACE INTO event(type,mtime,objid,user,comment," |
| 1488 | "bgcolor,euser,ecomment)" |
| 1489 | "VALUES('ci'," |
| 1490 | " coalesce(" |
| 1491 | " (SELECT julianday(value) FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1492 | " %.17g" |
| 1493 | " )," |
| 1494 | " %d,%Q,%Q," |
| 1495 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype>0)," |
| 1496 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1497 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d));", |
| 1498 | TAG_DATE, rid, p->rDate, |
| 1499 | rid, p->zUser, p->zComment, |
| 1500 | TAG_BGCOLOR, rid, |
| 1501 | TAG_USER, rid, |
| 1502 | TAG_COMMENT, rid |
| 1503 | ); |
| 1504 | zCom = db_text(0, "SELECT coalesce(ecomment, comment) FROM event" |
| 1505 | " WHERE rowid=last_insert_rowid()"); |
| 1506 | wiki_extract_links(zCom, rid, 0, p->rDate, 1, WIKI_INLINE); |
| 1507 | free(zCom); |
| 1508 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1483,25 +1483,25 @@ | |
| 1483 | add_one_mlink(rid, 0, p->aFile[i].zUuid, p->aFile[i].zName, 0); |
| 1484 | } |
| 1485 | } |
| 1486 | db_multi_exec( |
| 1487 | "REPLACE INTO event(type,mtime,objid,user,comment," |
| 1488 | "bgcolor,euser,ecomment,omtime)" |
| 1489 | "VALUES('ci'," |
| 1490 | " coalesce(" |
| 1491 | " (SELECT julianday(value) FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1492 | " %.17g" |
| 1493 | " )," |
| 1494 | " %d,%Q,%Q," |
| 1495 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype>0)," |
| 1496 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d)," |
| 1497 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d),%.17g);", |
| 1498 | TAG_DATE, rid, p->rDate, |
| 1499 | rid, p->zUser, p->zComment, |
| 1500 | TAG_BGCOLOR, rid, |
| 1501 | TAG_USER, rid, |
| 1502 | TAG_COMMENT, rid, p->rDate |
| 1503 | ); |
| 1504 | zCom = db_text(0, "SELECT coalesce(ecomment, comment) FROM event" |
| 1505 | " WHERE rowid=last_insert_rowid()"); |
| 1506 | wiki_extract_links(zCom, rid, 0, p->rDate, 1, WIKI_INLINE); |
| 1507 | free(zCom); |
| 1508 |