D 2010-12-10T15:08:15
J comment I\sended\sup\swith\sa\sworking\sdirectory\swhere\s<tt>fossil\schanges</tt>\ssays:\r\n<verbatim>\r\nIndex:\senv-msvc.cmd\r\n===================================================================\r\n---\senv-msvc.cmd\r\n+++\senv-msvc.cmd\r\n\r\nIndex:\sinclude/file/file.hpp\r\n===================================================================\r\n........\r\n</verbatim>\r\n\r\nFor\sme\sit\smeans\ssomething\slike\sthere\sare\sno\schanges,\sbut\sI\sdon't\sknow\swhy\sit\sgets\slisted\sin\sthe\sdiff.\sAnd\strying\sto\scommit\sall\sfiles\sbut\s'env-msvc.cmd'\s(specifying\sthe\sfiles\smanually\sas\s'fossil\scommit'\sarguments),\sgave\sme\sthis\serror\sAFTER\styping\sthe\scommit\smessage,\sno\smatter\show\smany\stimes\sI\stry\sto\scommit:\r\n<verbatim>\r\nNew_Version:\s4e03710731bdf5f33437b72ebf4166066e2e2984\r\nfossil:\stree\schecksum\sdoes\snot\smatch\smanifest\safter\scommit:\sbec214c60868becba5c0e7b1e612d26e\sversus\s6da255ae2109c7a801b897c43efba77c\r\n</verbatim>\r\n\r\nAbout\show\sI\sreached\sthat\sstate...\r\nI\shad\sa\stree\sof\schanges.\sThen\sI\sdid:\s<tt>fossil\smerge\s--cherrypick\sXXX</tt>\r\n\r\nThat\sbrought\sa\slittle\schange\sin\s<tt>env-msvc.cmd</tt>.\r\n\r\nI\sthen\sdid\s<tt>fossil\srevert<tt>.\r\n\r\nThat\ssaid\sto\shave\sreverted\sall\sthe\schanges\sI\shad.\r\n\r\nThen\sI\sdid\s<tt>fossil\sundo</tt>.\r\n\r\nThat\sbrought\sthe\schanges\sback.\sI\sdid\snot\swant\sthe\schange\sthat\sgot\smerged\sin\sthe\sfile\sfor\sthe\scherrypick,\sso\sI\sdid\s<tt>fossil\srevert\senv-msvc.cmd</tt>.\r\n\r\nAnd\sthen\sit\sstill\sappears\sin\sthe\sdiff\swithout\schanges\sshown.\sAs\sa\sclue,\sI'm\son\slinux,\sand\sthe\senv-msvc.cmd\shas\sCRLF\sline\sendings\s(it's\smostly\sto\sbe\sused\son\swindows).
J foundin [cf178577ec]
J status Open
J title tree\schecksum\sdoes\snot\smatch\smanifest\safter\scommit
J type Code_Defect
K 47d4e76139fd63f2aeb6ff14dfe8512a0734d599
U anonymous
Z cf251a152faf7598d2071d76506c306e