Fossil: Artifact [71f73ca0d1]

Artifact 71f73ca0d112fddf434a37ec1b3a5017070b46c7:

Ticket change [71f73ca0d1] - New ticket [986daabbc4] checkin command lost merge information if --force option used.. by anonymous 2010-10-19 06:48:59.
D 2010-10-19T06:48:59
J comment version\s[f1d309ccd7]\sor\slater,\scheckin\s--force\soption\sdisable\sclock\sskew\salarm.<br>But\sif\sthis\soption\sspecified,\scheckin_cmd()\sskip\sappend\smerged\sIDs\sto\smanifest's\s"P"\scard.<br>It\smust\snot\sskip\scollect\sIDs\sfrom\svmerge\stable\seven\sforceFlag\sis\sset.<br><blockquote><verbatim>---\s../7954ccba68/src/checkin.c\t2010-10-19\s00:28:10.437308800\sUTC\r\n+++\ssrc/checkin.c\t2010-10-19\s15:25:37.979195200\sUTC\r\n@@\s-826,23\s+826,26\s@@\r\n\s\s\sdb_finalize(&q);\r\n\s\s\szUuid\s=\sdb_text(0,\s"SELECT\suuid\sFROM\sblob\sWHERE\srid=%d",\svid);\r\n\s\s\sblob_appendf(&manifest,\s"P\s%s",\szUuid);\r\n-\r\n-\s\sif(\s!forceFlag\s){\r\n-\s\s\s\scheckin_verify_younger(vid,\szUuid,\szDate);\r\n-\s\s\s\sdb_prepare(&q2,\s"SELECT\smerge\sFROM\svmerge\sWHERE\sid=:id");\r\n-\s\s\s\sdb_bind_int(&q2,\s":id",\s0);\r\n-\s\s\s\swhile(\sdb_step(&q2)==SQLITE_ROW\s){\r\n-\s\s\s\s\s\sint\smid\s=\sdb_column_int(&q2,\s0);\r\n-\s\s\s\s\s\sif(\s!g.markPrivate\s&&\scontent_is_private(mid)\s)\scontinue;\r\n-\s\s\s\s\s\szUuid\s=\sdb_text(0,\s"SELECT\suuid\sFROM\sblob\sWHERE\srid=%d",\smid);\r\n-\s\s\s\s\s\sif(\szUuid\s){\r\n-\s\s\s\s\s\s\s\sblob_appendf(&manifest,\s"\s%s",\szUuid);\r\n-\s\s\s\s\s\s\s\scheckin_verify_younger(mid,\szUuid,\szDate);\r\n-\s\s\s\s\s\s\s\sfree(zUuid);\r\n-\s\s\s\s\s\s}\r\n-\s\s\s\s}\r\n-\s\s\s\sdb_finalize(&q2);\r\n-\s\s}\r\n+\s\sif(\s!forceFlag\s){\r\n+\s\s\s\scheckin_verify_younger(vid,\szUuid,\szDate);\r\n+\s\s}\r\n+\r\n+\s\sdb_prepare(&q2,\s"SELECT\smerge\sFROM\svmerge\sWHERE\sid=:id");\r\n+\s\sdb_bind_int(&q2,\s":id",\s0);\r\n+\s\swhile(\sdb_step(&q2)==SQLITE_ROW\s){\r\n+\s\s\s\sint\smid\s=\sdb_column_int(&q2,\s0);\r\n+\s\s\s\sif(\s!g.markPrivate\s&&\scontent_is_private(mid)\s)\scontinue;\r\n+\s\s\s\szUuid\s=\sdb_text(0,\s"SELECT\suuid\sFROM\sblob\sWHERE\srid=%d",\smid);\r\n+\s\s\s\sif(\szUuid\s){\r\n+\s\s\s\s\s\sblob_appendf(&manifest,\s"\s%s",\szUuid);\r\n+\s\s\s\s\s\sif(\s!forceFlag\s){\r\n+\s\s\s\s\s\s\s\scheckin_verify_younger(mid,\szUuid,\szDate);\r\n+\s\s\s\s\s\s}\r\n+\s\s\s\s\s\sfree(zUuid);\r\n+\s\s\s\s}\r\n+\s\s}\r\n+\s\sdb_finalize(&q2);\r\n\r\n\s\s\sblob_appendf(&manifest,\s"\\n");\r\n\s\s\sblob_appendf(&manifest,\s"R\s%b\\n",\s&cksum1);\r\n</verbatim></blockquote>
J foundin [f1d309ccd7]\s2010-08-29\s00:21:09
J private_contact 6b7d8d19b3584e0b0b59ee79d0f778ecd9f60111
J severity Cosmetic
J status Open
J title checkin\scommand\slost\smerge\sinformation\sif\s--force\soption\sused.
J type Code_Defect
K 986daabbc4b969dd22dc93d183b566f7faf004f9
U anonymous
Z e10ae57dbf3963d6bf7132381d5311bf