Search code examples
svnmergetrac

svn merge doesn't merge

I'm trying to merge some hotfixes from trunk onto a branch. When I compare trunk/foo.py and branches/feature/foo.py, I see differences. Yet, when I run svn merge https://<svn server>/trunk/foo.py foo.py, no changes get merged. Retrying with the --force option has no effect either. It seems like SVN thinks that the feature branch's copy of foo.py is the latest version. How do I convince SVN otherwise?

EDIT: My Subversion client is svn version 1.6.16 (Linux). The server is running trac, version 0.12.

EDIT2: The version of subversion the server is 1.6.9. Thanks to hasienda in the comments for pointing out that trac and subversion aren't necessarily correlated.

Solution

  • I'd start with;

    • Are both the Trunk and Branch files committed to SVN? No merge can happen if the files aren't in the repository.
    • Compare svn info <trunk>/foo.py and svn <branch>/foo.py; Check the last Changed Rev & Date, if SVN says they're the same file, no merge would happen.

    You can check out Advanced Merging for additional information.