Re: Merge error with SVN 1.8.0
From: Alexey Neyman <stilor_at_att.net>
Date: Fri, 28 Jun 2013 15:36:38 -0700
[copying dev@ because I found what the issue is]
Did some further investigation and it turns out that SVN1.8 client creates more
Here are some statistics:
SVN 1.7, merge --reintegrate
SVN 1.8, merge
SVN 1.8, merge --reintegrate
So, it looks like the new code for automatic detection of "reintegration merges" in 1.8
I am not comfortable leaving the server configuration at "unlimited", seeing that
On Sunday, June 23, 2013 12:56:27 PM Alexey Neyman wrote:
I've tried upgrading the client to SVN 1.8, and now see some strange merge errors
the --reintegrate option is now deprecated, its use is discouraged and SVN should be
[aneyman_at_build2 trunk]$ svn merge ^/MERGE-PATH
Strangely, 'svn merge --reintegrate' worked fine.
We are running 1.6.11 on the server (stock RedHat RPM, "1.6.11-2.el6_1.4" version). I
Any clues/suggestions as to how to debug this further?
This is an archived mail posted to the Subversion Dev mailing list.