title: Subversion Merge: Unchanged file showing as changed
body: <p>I do my development in a <code>development</code> branch and then merge into <code>trunk</code> before creating a tag for release.  I've been finding that one file continually shows up as changed when committing after the merge.  It has not changed.  I am posting this in hope that someone else has experienced the issue and knows what is going on.</p>
  
  <p><strong>Additional Info:</strong></p>
  
  <ul>
  <li>It's a php file, extending the Zend_Db_Table</li>
  <li>It does not show as an incoming change when merging</li>
  <li>The commit dialog lists the file, double-clicking the file to diff shows two different dialogs:
  <ul>
  <li>svn:mergeinfo
  <ol>
  <li>development branch, showing two version ranges and several other version numbers (comma-separated)</li>
  <li>trunk, a single version range</li>
  </ol></li>
  <li>file diff, with no differences</li>
  </ul></li>
  <li>The commit status dialog lists the file as modified, but doesn't list it as a "Sending content" item</li>
  </ul>