View Ticket
Not logged in
Ticket UUID: 741a0355a18796bae07abfb3cf370d3e5cf91215
Title: status reports unmodified files as EDITED
Status: Open Type: Code_Defect
Severity: Minor Priority:
Subsystem: Resolution:
Last Modified: 2011-02-08 22:50:26
Version Found In: 49cbf5e519
Description & Comments:
I haven't been able to figure out how to reproduce this yet, but there's something odd with the status command with regards to files being reported as EDITED but their contents is identical to what's in trunk. As near as I can tell, the command sequence went something like this:
% cd ~/src/repo/contrib
% rm -rf sub-module
% mkdir ~/src/repo2
% cd ~/src/repo2
% fs open ~/src/.fossils/repo.fossil
% mv contrib/sub-module ~/src/repo/contrib
% cd ~/src/repo
% fs stat | tail -1
EDITED     contrib/sub-module/file.sh
% fs di contrib/sub-module/file.sh
%

contrib/sub-module was imported on a vendor branch, if that makes any difference. Comparing md5s, the files are identical, but everything in contrib/sub-module gets reported as EDITED right now. It looks like checkin.c:status_report() is reporting the file as changed. Looking in schema.c:

@ -- Vfile.chnged is 0 for unmodified files, 1 for files that have
@ -- been edited or which have been subjected to a 3-way merge.

So it looks like there are some stale entries in vmerge (maybe?). Hope this is useful enough.