On Fri, Apr 11, 2014 at 11:24 PM, James Crofts
<jcrofts_at_comtechefdata.com> wrote:
> [I'm not currently a subscriber to the mailing list, so please copy me
> explicitly.]
>
> I'm not able to merge a working directory in Subversion 1.8.8. There are
> frequent changes
> to ~10.5 Mb binary files there, which SVN cannot automatically resolve, and
> there's a long
> delay right before the error occurs that suggests something could be timing
> out. However
> my server admin cannot find a timeout in the server that could be causing
> such a thing.
> Checking out a fresh copy of the working directory *is successful*. SVN
> 1.7.8 and 1.7.10
> don't cause this problem.
>
> I realize this could be partly/largely a server problem. If there's a way to
> get more
> specific error messages, that would be good to know, too.
>
> svn merge -r XXXX:YYYY https://server/svn/FOO/path/to/merge/from working_dir
> --- Merging rXXXX through rYYYY into 'working_dir'
> U working_dir\dir1\foo.htm
> ...
> C working_dir\dir2\bar.c_bak
> [Long delay]
> Summary of conflicts:
> Text conflicts: 5
> svn: E175002: REPORT request on '/svn/FOO/!svn/me' failed
>
>
>
> Server: VisualSVN 2.5.8
>
> Client: Windows 7 64-bit
> svn, version 1.8.8 (r1568071)
> compiled Feb 18 2014, 20:42:30 on x86-microsoft-windows
> [I use Tortoise a lot day-to-day, but I verified this issue using the
> command line]
I think usually there would be an error in the error log on the
server, corresponding to your "svn: E175002" error. Can you find an
error in the server logs?
An important difference between using a 1.7 client and a 1.8 client is
the client-side http library (in 1.7 it's 'neon' by default ('serf' is
optional) -- 1.8 only has 'serf' as http library). As a consequence,
also some different http request patterns are used. That may be the
difference that causes this to fail for you with svn 1.8, but succeed
with 1.7 on the client side.
To verify, maybe you can try to reproduce it with svn 1.7 with 'serf', thusly:
svn merge -r XXXX:YYYY https://server/svn/FOO/path/to/merge/from
working_dir --config-option servers:global:http-library=serf
I also suggest you read this section of the 1.8 release notes, that
explains some of the http-library differences:
http://subversion.apache.org/docs/release-notes/1.8.html#neon-deleted
Maybe you can experiment a bit with the http-bulk-updates client-side
configuration option to see if the behavior changes (for instance, try
setting it to 'yes' to force bulk-updates from the client-side).
(These are all just a couple of wild guesses trying to narrow down the problem.)
HTH,
--
Johan
Received on 2014-04-16 12:52:55 CEST