Subversion merge: immutable file displayed as modified

Question

I do my development in a branch development, and then combine in trunkbefore creating a tag for release. I found that one file is constantly displayed as changed when committed after merging. He has not changed. I am posting this in the hope that someone else has experienced the problem and knows what is going on.

Additional Information:

• This is a php file that extends Zend_Db_Table
• It does not appear as an incoming change when merging
• The file is displayed in the commit dialog box, by double-clicking the file on diff, two different dialogs are displayed:
  • SVN: mergeinfo
    • a development branch showing two version ranges and several other version numbers (separated by commas)
    • trunk, one version range
  • diff, no difference
• The commit status dialog box displays the file as modified, but does not appear in it as the "Submit content" element

Answer 1

This is the svn: mergeinfo property that is being updated. See this other question .

To summarize: either ignore it, or just commit, or delete the property svn:mergeinfoin this file. And follow the merging of tips in the SVN book to limit these properties to the root of your project tree.

update : this seems like a fix in SVN 1.7. From the release notes: reduced mergeinfo subtree changes .