Hmm, actually I made a mistake. The merge was done through our own gui tool that actually uses
svn 1.8.1 command line. Looks like there are a few serf fixes in 1.8.3 but the status entry
I found looks very suspicious.
From: Bert Huijben [mailto:bert@qqmail.nl]
Sent: 09 September 2013 12:51
To: James French; users@subversion.apache.org
Subject: RE: E120104: ra_serf: An error occurred during decompression
The current TortoiseSVN is already compiled against serf 1.3 as far as I can tell.
(TortoiseSVN uses its own custom build system and this patch just affects the build system)
Bert
From: James French [mailto:James.French@naturalmotion.com]
Sent: maandag 9 september 2013 13:15
To: users@subversion.apache.org<mailto:users@subversion.apache.org>
Subject: svn: E120104: ra_serf: An error occurred during decompression
Hi list,
I hit this when doing a reintegrate merge with svn 1.8.3 (tortoisesvn 1.8.2). I repeated the
operation with svn 1.7.8 and it did not occur. The following section in the STATUS file looks
highly relevant:
* ^/subversion/branches/1.8.x-serf-1.3+-windows
Allow compiling against serf 1.3 and later on Windows
Justification:
Serf 1.3 brings a lot of fixes that we need for 1.8.x stability.
Notes:
The dependency handling on Windows was updated for 1.9+, so this
needs a specific backport patch (r1517123)
Votes:
+1: rhuijben, brane
Cheers,
James
|