When bulk merging trunk to local release branch, svn reports whole
file conflicts as 'A'. :-(
svn status
after the merge is necessary to find the conflicts.
I'm using svn client:
mrs $ svn --version
svn, version 1.3.0 (r17949)
compiled Jan 4 2006, 12:42:53
and the server was either the same, or possibly and older version.
Have others seen this behavior? If you're curious, I was doing
something like:
svn merge svn+ssh://gnu.gnu.org/svn/gcc/tags/gcc_4_0_1_release svn
+ssh://gcc.gnu.org/svn/gcc/[EMAIL PROTECTED]
into apple/trunk, something like that, as I'm using a local svn
mirror for the branch.
