Problems merging with 1.6.2 client and 1.5.6 server

Hi,

Are there known issues merging between branches using a 1.6.2 client and a
1.5.6 server?

Here's what I'm seeing. I create a release branch with svn cp, commit
changes to the head, and do `svn merge -cNNN ^/trunk/path` in the branch's
working copy to backport a change to the branch. It takes a long time
(never finishes under http/mod_dav_svn, takes almost a minute under
svn+ssh), and then svn status shows a propset modification for
svn:mergeinfo for every file recursively under my working copy of the
branch, including files that I didn't touch in the change I'm merging.

Help?

Thanks,
-Clint
Received on 2010-02-07 20:36:40 CET