Yes, done.
Hyrum K Wright wrote on Sat, Jul 09, 2011 at 11:08:20 -0500: > Was this a merge from somewhere? If so, would it be useful to note > that in the log message? > > -Hyrum > > On Fri, Jul 8, 2011 at 8:54 PM, <danie...@apache.org> wrote: > > Author: danielsh > > Date: Sat Jul 9 01:54:29 2011 > > New Revision: 1144572 > > > > URL: http://svn.apache.org/viewvc?rev=1144572&view=rev > > Log: > > Improve error reporting for parsing serialized hashes. > > > > * subversion/tests/cmdline/svnadmin_tests.py > > (verify_with_invalid_revprops): Adjust expected text. > > > > * subversion/libsvn_subr/hash.c > > (svn_private_config.h): Include > > (hash_read): Improve error messages. > > > > Modified: > > subversion/trunk/ (props changed) > > subversion/trunk/subversion/include/private/svn_adler32.h (props > > changed) > > subversion/trunk/subversion/include/private/svn_string_private.h > > (props changed) > > subversion/trunk/subversion/include/private/svn_temp_serializer.h > > (props changed) > > subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (props > > changed) > > subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h (props > > changed) > > subversion/trunk/subversion/libsvn_subr/adler32.c (props changed) > > subversion/trunk/subversion/libsvn_subr/hash.c (contents, props > > changed) > > subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c (props > > changed) > > subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py > > > > Propchange: subversion/trunk/ > > ------------------------------------------------------------------------------ > > --- svn:mergeinfo (original) > > +++ svn:mergeinfo Sat Jul 9 01:54:29 2011 > > @@ -39,7 +39,7 @@ > > /subversion/branches/py-tests-as-modules:956579-1033052 > > /subversion/branches/ra_serf-digest-authn:875693-876404 > > /subversion/branches/reintegrate-improvements:873853-874164 > > -/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499 > > +/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568 > > /subversion/branches/subtree-mergeinfo:876734-878766 > > /subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288 > > /subversion/branches/svn-patch-improvements:918519-934609