I've fixed my environment such that in the future these merges will be
done using a 1.7.x svn.
danielsh_at_apache.org wrote on Tue, Dec 13, 2011 at 15:48:05 -0000:
> Author: danielsh
> Date: Tue Dec 13 15:48:04 2011
> New Revision: 1213746
>
> URL: http://svn.apache.org/viewvc?rev=1213746&view=rev
> Log:
> Merge r1210195 from trunk:
>
> * r1210195
> Canonicalize svnserve.conf input.
> Justification:
> Server asserts after being upgraded.
> Votes:
> +1: danielsh, philip, stsp
>
> Modified:
> subversion/branches/1.7.x/ (props changed)
> subversion/branches/1.7.x/CHANGES (props changed)
> subversion/branches/1.7.x/STATUS
> subversion/branches/1.7.x/subversion/include/private/svn_adler32.h (props changed)
> subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (props changed)
> subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h (props changed)
> subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
> subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
> subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c (props changed)
> subversion/branches/1.7.x/subversion/libsvn_subr/hash.c (props changed)
> subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
> subversion/branches/1.7.x/subversion/svnserve/serve.c
> subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (props changed)
Received on 2011-12-13 17:24:15 CET