Artifact 5227812b2b089cf9a39452fa70edb8e9f043fecb

Ticket change [5227812b2b] - New ticket 2de4ae6058 'checkout' command fail after merge without changes.. by anonymous on 2009-10-30 06:29:44.

D 2009-10-30T06:29:44
J comment The\s'checkout'\scommand\sscan\s'mlink'\stable\sfor\svalidate\sspecified\sartifact-id.<br>But\sin\srare\scase,\sif\smerged\sbut\sno\sfiles\sare\schanged,\sno\srows\sadded\sto\s'mlink'\stable.<br>I\sthink\sit\scould\sbe\suse\sfunction\s'is_a_version()'\sdefined\sin\s'update.c'\sfor\svalidation.<blockquote><verbatim>---\s../Fossil-3275d9c63c/src/checkout.c\s2009-10-30\s14:14:17.000000000\s+0900\r\n+++\ssrc/checkout.c\s\s\s\s\s\s2009-10-30\s14:15:03.000000000\s+0900\r\n@@\s-75,7\s+75,7\s@@\r\n\s\s\sif(\svid==0\s){\r\n\s\s\s\s\sfossil_fatal("no\ssuch\scheck-in:\s%s",\sg.argv[2]);\r\n\s\s\s}\r\n-\s\sif(\s!db_exists("SELECT\s1\sFROM\smlink\sWHERE\smid=%d",\svid)\s){\r\n+\s\sif(\s!is_a_version(vid)\s){\r\n\s\s\s\s\sfossil_fatal("object\s[%.10s]\sis\snot\sa\scheck-in",\sblob_str(&uuid));\r\n\s\s\s}\r\n\s\s\sload_vfile_from_rid(vid);</verbatim></blockquote>Example:\r\n<blockquote><verbatim>$\sfossil\snew\stest.fsl\r\n$\smd\sa\sb\r\n\r\n$\s#\sUser\sA\sadd\sa\sfile.\r\n$\scd\sa\s&&\sfossil\sopen\s../test.fsl\r\n$\sfor\se\sin\sfast\ssecond\sthird\sfourth;\sdo\secho\s$e;\sdone\s>\sfoo.txt\s;\scat\sfoo.txt\r\nfast\r\nsecond\r\nthird\r\nfourth\r\n$\sfossil\sadd\sfoo.txt\r\n$\sfossil\scommit\s--nosign\s-m\s"add\sfoo.txt"\r\n\r\n$\s#\sUser\sB\sopen\srepository.\r\n$\scd\s../b\s&&\sfossil\sopen\s../test.fsl\r\n\r\n$\s#\sUser\sA\sappend\snew\sline,\sand\sfix\stypo.\r\n$\scd\s../a\r\n$\secho\sfifth\s>>\sfoo.txt\r\n$\ssed\s-i\ss/fast/first/\sfoo.txt\r\n$\sfossil\scommit\s--nosign\s-m\s"add\sfifth\sand\sfix\stypo"\r\n\r\n$\s#\sUser\sB\salso\sfix\stypo\sand\scommit\sit\swith\s--force\soption.\r\n$\scd\s../b\r\n$\ssed\s-i\ss/fast/first/\sfoo.txt\r\n$\sfossil\scommit\s--nosign\s--force\s-m\s"fix\stypo"\r\n\r\n$\s#\sUser\sA\sfound\sUser\sB's\sfix.\smerge\sit.\r\n$\scd\s../a\r\n$\sfossil\stimeline\s-n\s1\r\n===\s2009-10-30\s===\r\n13:59:57\s[e9d9022b4f]\sfix\stypo\s(user:\ssilov\stags:\strunk)\r\n\r\n$\sfossil\smerge\se9d9022b4f\r\n$\sfossil\scommit\s--nosign\s-m\s"thank\syou,\sbut\salready\sfixed"\r\n\r\n$\s#\sUser\sB\sfound\smerged\scommit,\sbut\scan\snot\scheckout\sit.\r\n$\scd\s../b\r\n$\sfossil\stimeline\s-n\s1\r\n===\s2009-10-30\s===\r\n14:01:06\s[2ba1ef2ce2]\s*MERGE*\sthank\syou,\sbut\salready\sfixed\s(user:\ssilov\stags:\strunk)\r\n\r\n$\sfossil\scheckout\s--latest\r\nfossil:\sobject\s[2ba1ef2ce2]\sis\snot\sa\scheck-in</verbatim></blockquote>
J foundin 3275d9c63c\s2009-10-21T15:43:23
J private_contact 6b7d8d19b3584e0b0b59ee79d0f778ecd9f60111
J severity Minor
J status Open
J title 'checkout'\scommand\sfail\safter\smerge\swithout\schanges.
J type Code_Defect
K 2de4ae605844fe3fb7fdc5c0f8740b936d47a746
U anonymous
Z 8d154ca92a07a7eae2de7e980980b4dc