r31345 | cmpilato | 2008-05-21 17:40:38 EDT Changed paths: M /branches/1.5.x/subversion/tests/cmdline/prop_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/main.py Merge from trunk this change group: * r31303 Skip a recently backported test when doing backwards-compatibility testing. Notes: Makes the backwards-compatibility test suite pass again. Votes: +1: glasser, danielsh, cmpilato ---------------------------------------------------------------------------- r31324 | hwright | 2008-05-21 00:27:31 EDT Changed paths: M /branches/1.5.x/subversion/bindings/javahl/native/SVNClient.cpp Merge r31292 from trunk: * r31292 JavaHL: add support for Windows SSL certs as was done for CLI. Notes: This was added to the CLI in r23812 but was never added in JavaHL. Votes: +1: markphip, cmpilato ---------------------------------------------------------------------------- r31323 | hwright | 2008-05-20 23:42:51 EDT Changed paths: M /branches/1.5.x/contrib/server-side/mod_dontdothat/README M /branches/1.5.x/contrib/server-side/mod_dontdothat/mod_dontdothat.c Merge r30629, r30787 from trunk: * r30629, r30787 mod_dontdothat: Allow opt-out of replay rejection. Notes: r30787 is a typo fix. Votes: +1: jerenkrantz, cmpilato +0: lgo ---------------------------------------------------------------------------- r31216 | cmpilato | 2008-05-15 15:40:26 EDT Changed paths: M /branches/1.5.x/subversion/include/svn_repos.h M /branches/1.5.x/subversion/libsvn_repos/fs-wrap.c M /branches/1.5.x/subversion/tests/cmdline/prop_tests.py Merge this change group from trunk: * r31138, r31141, r31157, r31209 Validate svn:date property values in libsvn_repos. Notes: r31141 is a docstring change. r31157 marks the regression test XFail over DAV. r31209 is a teeny typo (read: obvious) fix Votes: +1: danielsh, kfogel, cmpilato ---------------------------------------------------------------------------- r31186 | hwright | 2008-05-15 00:00:53 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge r30746, r30747 from trunk: * r30746, r30747 Fix a minor merge range notification header bug. Notes: r30747 is just cleanup of some cruft that snuck in with r30746, thus adhering to my "every commit should need a follow-up" ethos. r30746 contains, like, one tiny *real* change, then a whole bunch of bogus indentation changes that were supposed to be part of r30748. Probably best to not fix that indentation during backport, in case we later backport r30748. Votes: +1: pburba, markphip, cmpilato ---------------------------------------------------------------------------- r31184 | hwright | 2008-05-14 23:57:18 EDT Changed paths: M /branches/1.5.x/build.conf Merge r31056 from trunk: * r31056 Enable svn.diff in swig-py on Windows. Votes: +1: epg, arfrever, cmpilato ---------------------------------------------------------------------------- r31183 | hwright | 2008-05-14 23:56:17 EDT Changed paths: M /branches/1.5.x/subversion/include/svn_client.h M /branches/1.5.x/subversion/libsvn_client/add.c Merge r31131 from trunk: * r31131 Restore compatibility of svn_client_add3()'s non-recursive behavior. Notes: This fixes an API incompatibility. But in practice it's a minor problem, and could probably wait until 1.5.1 if necessary. Votes: +1: kfogel, epg, cmpilato ---------------------------------------------------------------------------- r31182 | hwright | 2008-05-14 23:53:40 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_subr/path.c M /branches/1.5.x/subversion/tests/libsvn_subr/path-test.c Merge r31162 from trunk: * r31162 Fix an OBOE in svn_path_splitext(). Votes: +1: cmpilato, kfogel, danielsh ---------------------------------------------------------------------------- r31164 | hwright | 2008-05-14 10:44:27 EDT Changed paths: M /branches/1.5.x/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /branches/1.5.x/contrib/client-side/svnmerge/svnmerge-migrate-test.sh Merge r31081, r31082, r31153, r31155 from trunk: * r31081, r31082, r31153, r31155 Various improvements to svnmerge-migrate-history.py for dealing with the kinds of problems caused by svnmerge.py's total ignorance of object history. Votes: +1: cmpilato, dlr ---------------------------------------------------------------------------- r31149 | hwright | 2008-05-13 00:53:43 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_ra/compat.c Merge r31126 from trunk: * r31126 Use 'void *' to avoid compile warnings and eliminate casts. Justification: Trivial fix. Allows clean build with EXTRA_CFLAGS='-Wall -Wno-uninitialized -Wdeclaration-after-statement -Werror' Votes: +1: djames, kfogel, lgo ---------------------------------------------------------------------------- r31148 | hwright | 2008-05-13 00:51:24 EDT Changed paths: M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Merge r31145 from trunk: * r31145 Fix memory leaks in Python bindings. Justification: Memory leaks are bad. Notes: Depends on r31055 and r31066 (see above) Votes: +1: djames +0: epg ---------------------------------------------------------------------------- r31147 | hwright | 2008-05-13 00:50:16 EDT Changed paths: M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h M /branches/1.5.x/subversion/bindings/swig/python/svn/wc.py M /branches/1.5.x/subversion/bindings/swig/python/tests/wc.py M /branches/1.5.x/subversion/bindings/swig/svn_wc.i Merge r31055, r31066 from trunk: * r31055 (subversion/bindings/swig), r31066 Make svn_wc_diff_callbacks2_t work in Python (not a new interface, it was just broken for Python until r31055). Notes: 'svn merge -c 31055 ^/trunk/subversion/bindings/swig subversion/bindings/swig' cleanly merges the Python change. Votes: +1: epg +0: djames ---------------------------------------------------------------------------- r31114 | hwright | 2008-05-09 10:47:36 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_ra_serf/serf.c Merge r31107 from trunk: * r31107 ra_serf: Fix API bug when fetched_rev is non-NULL and revision is invalid. Votes: +1: epg, jerenkrantz, kfogel