Ticket Change Details
Not logged in
Overview

Artifact ID: b69854c688458b751eb31077b9d3cefe4553ef49
Ticket: 741a0355a18796bae07abfb3cf370d3e5cf91215
status reports unmodified files as EDITED
User & Date: anonymous 2011-02-08 22:50:26
Changes

  1. comment changed to:
    I haven't been able to figure out how to reproduce this yet, but there's something odd with the <code>status</code> command with regards to files being reported as <code>EDITED</code> but their contents is identical to what's in trunk.  As near as I can tell, the command sequence went something like this:
    
    <pre>% 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
    %</pre>
    
    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:
    
    <pre>@ -- Vfile.chnged is 0 for unmodified files, 1 for files that have
    @ -- been edited or which have been subjected to a 3-way merge.</pre>
    
    So it looks like there are some stale entries in vmerge (maybe?).  Hope this is useful enough.
    
  2. foundin changed to: "49cbf5e519"
  3. private_contact changed to: "84f59114b7eee7088fd7e2932599c69c9ad0761b"
  4. severity changed to: "Minor"
  5. status changed to: "Open"
  6. title changed to: "status reports unmodified files as EDITED"
  7. type changed to: "Code_Defect"