Artifact b69854c688458b751eb31077b9d3cefe4553ef49:

Ticket change [b69854c688] - New ticket [741a0355a1] status reports unmodified files as EDITED. by anonymous 2011-02-08 22:50:26.

---

D 2011-02-08T22:50:26.123
J comment I\shaven't\sbeen\sable\sto\sfigure\sout\show\sto\sreproduce\sthis\syet,\sbut\sthere's\ssomething\sodd\swith\sthe\s<code>status</code>\scommand\swith\sregards\sto\sfiles\sbeing\sreported\sas\s<code>EDITED</code>\sbut\stheir\scontents\sis\sidentical\sto\swhat's\sin\strunk.\s\sAs\snear\sas\sI\scan\stell,\sthe\scommand\ssequence\swent\ssomething\slike\sthis:\r\n\r\n<pre>%\scd\s~/src/repo/contrib\r\n%\srm\s-rf\ssub-module\r\n%\smkdir\s~/src/repo2\r\n%\scd\s~/src/repo2\r\n%\sfs\sopen\s~/src/.fossils/repo.fossil\r\n%\smv\scontrib/sub-module\s~/src/repo/contrib\r\n%\scd\s~/src/repo\r\n%\sfs\sstat\s|\stail\s-1\r\nEDITED\s\s\s\s\scontrib/sub-module/file.sh\r\n%\sfs\sdi\scontrib/sub-module/file.sh\r\n%</pre>\r\n\r\ncontrib/sub-module\swas\simported\son\sa\svendor\sbranch,\sif\sthat\smakes\sany\sdifference.\s\sComparing\smd5s,\sthe\sfiles\sare\sidentical,\sbut\severything\sin\scontrib/sub-module\sgets\sreported\sas\sEDITED\sright\snow.\s\sIt\slooks\slike\scheckin.c:status_report()\sis\sreporting\sthe\sfile\sas\schanged.\s\sLooking\sin\sschema.c:\r\n\r\n<pre>@\s--\sVfile.chnged\sis\s0\sfor\sunmodified\sfiles,\s1\sfor\sfiles\sthat\shave\r\n@\s--\sbeen\sedited\sor\swhich\shave\sbeen\ssubjected\sto\sa\s3-way\smerge.</pre>\r\n\r\nSo\sit\slooks\slike\sthere\sare\ssome\sstale\sentries\sin\svmerge\s(maybe?).\s\sHope\sthis\sis\suseful\senough.
J foundin 49cbf5e519
J private_contact 84f59114b7eee7088fd7e2932599c69c9ad0761b
J severity Minor
J status Open
J title status\sreports\sunmodified\sfiles\sas\sEDITED
J type Code_Defect
K 741a0355a18796bae07abfb3cf370d3e5cf91215
U anonymous
Z cb005455f58ca8f138b627672bcc03d0