Artifact 5a7c868ff645e4f7e6f2b90d9c7aec21cf088e66:

Ticket change [5a7c868ff6] - Ticket [5cc33a6aa0] Committing one file while another is pending delete will commit both files. status still Open with 1 other change by drh 2010-11-24 15:06:03.

---

D 2010-11-24T15:06:03
J comment It\sseems\sthat\sI\shave\sfound\sa\sbug\sin\sfossil.\s\sI\sfound\sthis\sas\sI\swas\strying\sto\sadd\sa\sfile\sbut\sa\sdiff\sof\smy\scommit\sshows\sthat\sI\sremoved\sone\sas\swell.\s\sHowever\swhen\sI\scommitted,\sI\sonly\sspecified\sthe\sfile\sthat\sI\swanted\sto\sadd:\r\n\r\n#\sfossil\scommit\spath/to/file_to_add\s-m\s"Added\sfile."\r\n\r\nI\sperformed\sthe\sfollowing\soperations\sto\stest\sand\sreproduce\sthe\sbug:\r\n\r\n<pre>\r\n#\smkdir\s/tmp/fossilbug\r\n#\scd\s/tmp/fossilbug\r\n#\sfossil\snew\smy.fossil\r\nproject-id:\s2b1773e0efaf0a28844f51226f4dcf88ff7ed73b\r\nserver-id:\s\s1b7807e55a0d9c863b0e47063d59ef700d7f03cc\r\nadmin-user:\sadmin\s(initial\spassword\sis\s"15b831")\r\n#\sfossil\sopen\smy.fossil\r\n#\sdate\s>\sfile1\r\n#\sdate\s>\sfile2\r\n#\sdate\s>\sfile3\r\n#\sdate\s>\sfile4\r\n#\sfossil\sadd\sfile*\r\nADDED\s\sfile1\r\nADDED\s\sfile2\r\nADDED\s\sfile3\r\nADDED\s\sfile4\r\n#\sfossil\scommit\s-m\s"Added\s4\stest\sfiles"\r\nNew_Version:\s181cd0b02dfd84476e804eb9230e87c7ff26bdcb\r\n#\sfossil\sdelete\sfile1\r\nDELETED\s\sfile1\r\n#\sdate\s>\sfile4\r\n#\sfossil\schanges\r\nDELETED\s\s\s\sfile1\r\nEDITED\s\s\s\s\sfile4\r\n#\sfossil\scommit\sfile4\s-m\s"committing\sONLY\sthe\smodified\swhile\sa\sfile\sis\spending\sdeleted"\r\nNew_Version:\s98de35d30e35a6a206c943b7b34afbe4744db2cf\r\n#\sfossil\schanges\r\nDELETED\s\s\s\sfile1\r\n</pre>\r\n\r\nAs\syou\scan\ssee,\sI\screated\sa\snew\sfossil\srepo\sfor\smy\stest.\s\sAdded\s4\sfiles\swith\srandom\scontent\sand\scommitted.\r\n\r\nThen\sI\sremoved\sone\sfile\sand\sI\smodified\sanother.\s\sI\scommit\sthe\sfile\sthat\sI\smodified\sbut\snot\sthe\sfile\sthat\sI\sremoved.\s\sIn\smy\slocal\sfolder,\sthe\sdeleted\sfile\sis\sstill\spending.\s\sHowever...\sif\syou\suse\sfinfo\sor\sdiff..\syou\swill\ssee\sthat\sthe\sfile\sWAS\sdeleted\son\smy\scommit.\r\n\r\n<pre>\r\n#\sfossil\sfinfo\sfile1\r\nHistory\sof\sfile1\r\n2010-11-23\s[98de35d30e]\sDELETED\stest\smodified\swhile\sa\sfile\sis\spending\sdeleted\r\n\s\s\s\s\s\s\s\s\s\s\s(user:\sroychri)\r\n2010-11-23\s[181cd0b02d]\stest\s1\s(user:\sroychri,\sartifact:\s[99d7a1f973])\r\n#\sfossil\sdiff\s--from\s181cd0b02dfd84476e804eb9230e87c7ff26bdcb\s--to\s98de35d30e35a6a206c943b7b34afbe4744db2cf\r\nDELETED\sfile1\r\nCHANGED\sfile4\r\nIndex:\sfile4\r\n===================================================================\r\n---\sfile4\r\n+++\sfile4\r\n@@\s-1,1\s+1,1\s@@\r\n-Tue\s23\sNov\s2010\s10:14:01\sEST\r\n+Tue\s23\sNov\s2010\s10:14:32\sEST\r\n</pre>\r\n\r\nThen\swhen\sI\scommit\sthe\sdeleted\sfile,\sit\screates\san\sempty\scommit\s(diff\sempty\sand\snot\sfiles\sin\slist).\r\n\r\nCONCLUSION:\r\n\r\nI\scannot\sperform\sa\spartial\scommit\s(where\sI\sspecify\seach\sfile\son\sthe\scommand\sline)\swhen\sI\shave\spending\sdeleted\sfiles\sthat\sI\sam\sNOT\sready\sto\scommit.\r\n\r\n<hr\s/><i>anonymous\sadded\son\s2010-11-24\s14:06:58:</i><br\s/>\r\nIt\sseemed\sthat\sfossil\sis\snot\sformatting\smy\sentry\sthe\sway\sI\sexpected.\s\sSorry\sabout\sthat.\r\n\r\nYou\scan\sview\ssource\sto\ssee\sit\swell.\s\sThe\sadmins\sof\sthis\ssite\scan\sput\sa\s"pre"\sHTML\stag\saround\smy\stext\sso\sthe\sformatting\sis\sbetter.\r\n\r\nI\scannot\sseem\sto\sbe\sable\sto\sedit\smy\sprevious\sentry.
K 5cc33a6aa0621be8936f7b34b8c8e0e8f16f9ce7
U drh
Z c9db11ef9685741bfde212abfa6aeab9