On Fri, Mar 27, 2015 at 10:11 PM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> On Fri, Mar 27, 2015 at 8:05 PM, Joan Baiges <jbaiges_at_cimne.upc.edu> wrote:
>> Dear all,
>> We are using svn 1.6 as a server, and most of my teammates are also using
>> svn 1.6. I recently upgraded to 1.8 and after a merge operation from my 1.8
>> client several issues have arised:
>> - My colleagues (svn client 1.6) are unable to merge branches
>> getting errors of the type of:
>> svn: El servidor envió un valor de devolución inesperado (500 Internal
>> Server Error) en respuesta al requerimiento PROPFIND para
>> «/p/femuss/trunk/Femuss/Tests/test24/cupula3d3.gid/results/cupula3d30.nsi.sol»
>> svn: Error leyendo la respuesta almacenada temporalmente al pedido REPORT
>>
>> - I (svn client 1.8) can merge properly, but the merge operation is really
>> slow (long waiting time before merge starts, slow file merge afterwards).
>>
>> Is this a known issue? Are there any fixes?
>> Thank you for your help.
>
> There should be an error in the server-side logs corresponding to that
> '500 Internal Server Error' that the 1.6 clients get. Can you send us
> the error from the server logs?
I just spotted the following in the 1.7 release notes, in the "New
feature compatibility table" [1]:
[[[
Feature: reduced subtree mergeinfo recording
Minimum Client: 1.7
Minimum Server: any
Minimum Repository: any
Notes: If both pre-1.7 clients and 1.7 clients are used to perform
merges to the same branch, the pre-1.7 clients may experience slower
merge performance.
]]]
Maybe your problem is related to huge amounts of subtree mergeinfo?
[1] http://subversion.apache.org/docs/release-notes/1.7.html#new-feature-compatibility-table
--
Johan
Received on 2015-03-27 22:36:15 CET