svn commit: r1241344 - in /subversion/branches/1.6.x: ./ STATUS subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/python/tests/mergeinfo.py

2012-02-06 Thread svn-role
Author: svn-role Date: Tue Feb 7 04:00:08 2012 New Revision: 1241344 URL: http://svn.apache.org/viewvc?rev=1241344&view=rev Log: Merge the r1235264 group from trunk: * r1235264, r1235296, r1235302, r1235736 Fix a swig-py memory leak. Justification: Seen in the wild with significant e

svn commit: r1241313 - /subversion/branches/1.6.x/STATUS

2012-02-06 Thread danielsh
Author: danielsh Date: Tue Feb 7 01:29:47 2012 New Revision: 1241313 URL: http://svn.apache.org/viewvc?rev=1241313&view=rev Log: Nominate the r1235264 group as approved (with gstein's voice via dev@). Suggested by: Trent Nelson Modified: subversion/branches/1.6.x/STATUS Modified: subversio

[Subversion Wiki] Update of "InheritedProperties" by pburba

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "InheritedProperties" page has been changed by pburba: http://wiki.apache.org/subversion/InheritedProperties?action=diff&rev1=24&rev2=25 Comment: Tweak the proposed svn propget

[Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=20&rev2=21 {{attachment:merge-reint-reint-1.png|svn

New attachment added to page SvnMergeTheory on Subversion Wiki

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page "SvnMergeTheory" for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-reint-1.txt Attachment size: 318 Attachment link: http://wiki.apache.o

New attachment added to page SvnMergeTheory on Subversion Wiki

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page "SvnMergeTheory" for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-reint-1.png Attachment size: 38543 Attachment link: http://wiki.apache

[Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=19&rev2=20 {{attachment:merge-reint-sync-1.png|svn r

[Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=18&rev2=19 TODO: How a record-only merge ("keep-alive d

New attachment added to page SvnMergeTheory on Subversion Wiki

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page "SvnMergeTheory" for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-sync-1.txt Attachment size: 317 Attachment link: http://wiki.apache.or

New attachment added to page SvnMergeTheory on Subversion Wiki

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page "SvnMergeTheory" for change notification. An attachment has been added to that page by JulianFoad. Following detailed information is available: Attachment name: merge-reint-sync-1.png Attachment size: 38905 Attachment link: http://wiki.apache.

[Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=17&rev2=18 * For the 3-way merge, Subversion selects a

svn commit: r1241097 - in /subversion/trunk/subversion: libsvn_client/repos_diff.c libsvn_delta/compat.c libsvn_fs_base/tree.c libsvn_fs_fs/tree.c libsvn_wc/externals.c libsvn_wc/update_editor.c

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 17:48:36 2012 New Revision: 1241097 URL: http://svn.apache.org/viewvc?rev=1241097&view=rev Log: Ev2 shims: Truthfully report our base checksum as being that of the empty stream. Note: This breaks several assumptions in various delta-editor receivers about the vali

svn commit: r1241096 - in /subversion/trunk/subversion: include/svn_config.h libsvn_repos/repos.c svnserve/serve.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 17:46:17 2012 New Revision: 1241096 URL: http://svn.apache.org/viewvc?rev=1241096&view=rev Log: Add support for configuring the hook script environment from svnserve.conf. * subversion/include/svn_config.h (SVN_CONFIG_SECTION_HOOKS_ENV): New config section for svns

[Subversion Wiki] Update of "InheritedProperties" by pburba

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "InheritedProperties" page has been changed by pburba: http://wiki.apache.org/subversion/InheritedProperties?action=diff&rev1=23&rev2=24 Comment: Update 'Merging Inherited Prope

Re: svn commit: r1241050 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread Daniel Shahaf
Stefan Sperling wrote on Mon, Feb 06, 2012 at 17:12:32 +0100: > On Mon, Feb 06, 2012 at 05:59:04PM +0200, Daniel Shahaf wrote: > > This still strips whitespace around ='s in the value: > > SVNHooksEnv "name = x = y" > > will result in > > setenv("name", "x=y", 1) > > whereas I believe it sh

Re: svn commit: r1241050 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread Stefan Sperling
On Mon, Feb 06, 2012 at 05:59:04PM +0200, Daniel Shahaf wrote: > This still strips whitespace around ='s in the value: > SVNHooksEnv "name = x = y" > will result in > setenv("name", "x=y", 1) > whereas I believe it should result in > setenv("name", "x = y", 1) > (and, to be honest, I'd

svn commit: r1241054 - /subversion/trunk/subversion/libsvn_subr/checksum.c

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 16:01:27 2012 New Revision: 1241054 URL: http://svn.apache.org/viewvc?rev=1241054&view=rev Log: * subversion/libsvn_subr/checksum.c (svn_checksum_is_empty_checksum): Handle the NULL checksum. Modified: subversion/trunk/subversion/libsvn_subr/checksum.c Modi

Re: svn commit: r1241050 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread Daniel Shahaf
This still strips whitespace around ='s in the value: SVNHooksEnv "name = x = y" will result in setenv("name", "x=y", 1) whereas I believe it should result in setenv("name", "x = y", 1) (and, to be honest, I'd be happy with setenv("name ", " x = y", 1) as well). WDYT? How should i

svn commit: r1241050 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 15:46:54 2012 New Revision: 1241050 URL: http://svn.apache.org/viewvc?rev=1241050&view=rev Log: * subversion/mod_dav_svn/mod_dav_svn.c (SVNHooksEnv_cmd): Handle environment variables with values containing '='. While here, dup strings referenced from the hash tab

svn commit: r1241047 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 15:36:24 2012 New Revision: 1241047 URL: http://svn.apache.org/viewvc?rev=1241047&view=rev Log: Fix a pool lifetime problem with mod_dav_svn's hooks environment. * subversion/mod_dav_svn/mod_dav_svn.c (merge_dir_config): Do not merge parent and child hashes, just c

svn propchange: r1241012 - svn:log

2012-02-06 Thread danielsh
Author: danielsh Revision: 1241012 Modified property: svn:log Modified: svn:log at Mon Feb 6 15:35:58 2012 -- --- svn:log (original) +++ svn:log Mon Feb 6 15:35:58 2012 @@ -1,3 +1,5 @@ +[ Reverted in r1241040. ] + Alloc

svn commit: r1241044 - /subversion/trunk/subversion/libsvn_subr/checksum.c

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 15:33:36 2012 New Revision: 1241044 URL: http://svn.apache.org/viewvc?rev=1241044&view=rev Log: strcmp()'ing a memory buffer which may (or may not!) contain NULL-bytes is a Bad Idea. Stop doing it. * subversion/libsvn_subr/checksum.c (svn_checksum_is_empty_chec

svn commit: r1241040 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 15:18:48 2012 New Revision: 1241040 URL: http://svn.apache.org/viewvc?rev=1241040&view=rev Log: Revert r1241012. A better fix has been found and will be committed shortly. Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Modified: subversion/trunk

[Subversion Wiki] Trivial Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=16&rev2=17 * For the 3-way merge, Subversion selects a

Re: svn commit: r1241025 - in /subversion/trunk/subversion: include/svn_checksum.h libsvn_subr/checksum.c tests/libsvn_subr/checksum-test.c

2012-02-06 Thread Hyrum K Wright
On Mon, Feb 6, 2012 at 8:50 AM, Daniel Shahaf wrote: > hwri...@apache.org wrote on Mon, Feb 06, 2012 at 14:42:45 -: >> +  checksum = svn_checksum_empty_checksum(svn_checksum_md5, pool); >> +  SVN_TEST_ASSERT(svn_checksum_is_empty_checksum(checksum)); >> + > > That doesn't test much -- both fun

svn commit: r1241033 - /subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 14:59:18 2012 New Revision: 1241033 URL: http://svn.apache.org/viewvc?rev=1241033&view=rev Log: Extend the checksum empty test to test a manually created empty checksum. Suggested by: danielsh * subversion/tests/libsvn_subr/checksum-test.c (test_checksum_empty)

Re: svn commit: r1241025 - in /subversion/trunk/subversion: include/svn_checksum.h libsvn_subr/checksum.c tests/libsvn_subr/checksum-test.c

2012-02-06 Thread Daniel Shahaf
hwri...@apache.org wrote on Mon, Feb 06, 2012 at 14:42:45 -: > + checksum = svn_checksum_empty_checksum(svn_checksum_md5, pool); > + SVN_TEST_ASSERT(svn_checksum_is_empty_checksum(checksum)); > + That doesn't test much -- both functions just call svn_md5__empty_string_digest() which returns

svn commit: r1241025 - in /subversion/trunk/subversion: include/svn_checksum.h libsvn_subr/checksum.c tests/libsvn_subr/checksum-test.c

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 14:42:44 2012 New Revision: 1241025 URL: http://svn.apache.org/viewvc?rev=1241025&view=rev Log: Add an API which easily checks if a checksum is that of the empty string. * subversion/include/svn_checksum.h (svn_checksum_is_empty_checksum): New. * subversion/lib

svn commit: r1241017 - /subversion/trunk/build/run_tests.py

2012-02-06 Thread hwright
Author: hwright Date: Mon Feb 6 14:20:10 2012 New Revision: 1241017 URL: http://svn.apache.org/viewvc?rev=1241017&view=rev Log: Complete bikeshed: Use the entire width of the terminal for the dotted leader when running tests for 'make check'. * build/run_tests.py (LINE_LENGTH): Remove. (_get

svn commit: r1241012 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 13:52:54 2012 New Revision: 1241012 URL: http://svn.apache.org/viewvc?rev=1241012&view=rev Log: Allocate mod_dav_svn's hook environment in a persistent pool. Fixes crashes. * subversion/mod_dav_svn/mod_dav_svn.c (create_dir_config): The pool passed here doesn't hav

svn commit: r1241003 - in /subversion/trunk/tools/dev: merge-graph.py mergegraph/ mergegraph/__init__.py mergegraph/mergegraph.py

2012-02-06 Thread julianfoad
Author: julianfoad Date: Mon Feb 6 13:16:27 2012 New Revision: 1241003 URL: http://svn.apache.org/viewvc?rev=1241003&view=rev Log: Break out most of the code in merge-graph.py into a separate Python module. * tools/dev/mergegraph New directory. * tools/dev/mergegraph/__init__.py New file.

[Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad

2012-02-06 Thread Apache subversion Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=15&rev2=16 * For the 3-way merge, Subversion selects a

svn commit: r1240999 - /subversion/trunk/subversion/libsvn_repos/hooks.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 12:42:17 2012 New Revision: 1240999 URL: http://svn.apache.org/viewvc?rev=1240999&view=rev Log: * subversion/libsvn_repos/hooks.c (env_from_env_hash): Return an empty array if the provided hook_env is empty and not NULL. Suggested by: danielsh Modified: sub

svn propchange: r1240997 - svn:log

2012-02-06 Thread stsp
Author: stsp Revision: 1240997 Modified property: svn:log Modified: svn:log at Mon Feb 6 12:36:51 2012 -- --- svn:log (original) +++ svn:log Mon Feb 6 12:36:51 2012 @@ -13,3 +13,9 @@ The conversion to an array of C strin

svn commit: r1240997 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h mod_dav_svn/repos.c

2012-02-06 Thread stsp
Author: stsp Date: Mon Feb 6 12:23:02 2012 New Revision: 1240997 URL: http://svn.apache.org/viewvc?rev=1240997&view=rev Log: Make the svn_repos_hooks_setenv() API expect an apr_hash_t instead of an array of C strings. This makes it easier for callers to use this API. The conversion to an array of