Unexplainable collisions in merge (against vendor's SVN)

Hi all,

I am getting collisions in a merge and do not understand why. I've boiled it down to the following scenario:

cd /mystuff/svn/vendor/microlog/branches/ ## this is a working copy of my own SVN repository
svn export -r 590 https://microlog.svn.sourceforge.net/svnroot/microlog/trunk mystuff-mods
svn add mystuff-mods
svn commit -m "from rev 590"

      so far so good. But with the following, I would expect to simply get the diffs from 590 to HEAD merged into my working copy, without collisions:

svn merge -r590:HEAD https://microlog.svn.sourceforge.net/svnroot/microlog/trunk mystuff-mods

     ..but this is where some files, not all, do have collisions. Any hint would be great, I'm stuck here, how can this happen ? :-(

Diego

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-14 20:13:21 CET