svn commit: r1159068 - /subversion/site/publish/packages.html

Author: danielsh Date: Thu Aug 18 07:32:56 2011 New Revision: 1159068 URL: http://svn.apache.org/viewvc?rev=1159068view=rev Log: * /site/publish/packages.html: Link to #pre-releases from the TOC section. Modified: subversion/site/publish/packages.html Modified:

svn commit: r1159084 - /subversion/branches/1.7.x/STATUS

Author: rhuijben Date: Thu Aug 18 08:30:50 2011 New Revision: 1159084 URL: http://svn.apache.org/viewvc?rev=1159084view=rev Log: * STATUS: Cast some votes Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1159093 - in /subversion/trunk: build/transform_sql.py subversion/libsvn_wc/wc-queries.sql

Author: danielsh Date: Thu Aug 18 08:53:04 2011 New Revision: 1159093 URL: http://svn.apache.org/viewvc?rev=1159093view=rev Log: Factor out a repeated code fraction, for maintainability and readability. * build/transform_sql.py (Processor.process_file): Grow support for a

svn commit: r1159097 - /subversion/branches/1.7.x-r1159093/

Author: danielsh Date: Thu Aug 18 09:00:56 2011 New Revision: 1159097 URL: http://svn.apache.org/viewvc?rev=1159097view=rev Log: Create r1159093 backport branch. Added: subversion/branches/1.7.x-r1159093/ (props changed) - copied from r1159096, subversion/branches/1.7.x/ Propchange:

svn commit: r1159098 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql

Author: danielsh Date: Thu Aug 18 09:05:46 2011 New Revision: 1159098 URL: http://svn.apache.org/viewvc?rev=1159098view=rev Log: * subversion/libsvn_wc/wc-queries.sql: Remove unnecessary parentheses. Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql Modified:

svn commit: r1159100 - in /subversion/branches/1.7.x-r1159093: ./ build/transform_sql.py subversion/libsvn_wc/wc-queries.sql

Author: danielsh Date: Thu Aug 18 09:08:02 2011 New Revision: 1159100 URL: http://svn.apache.org/viewvc?rev=1159100view=rev Log: On the 1.7.x-r1159093 branch, merge r1159093 from trunk. Modified: subversion/branches/1.7.x-r1159093/ (props changed)

svn commit: r1159101 - /subversion/trunk/build/transform_sql.py

Author: danielsh Date: Thu Aug 18 09:09:38 2011 New Revision: 1159101 URL: http://svn.apache.org/viewvc?rev=1159101view=rev Log: * build/transform_sql.py (Processor.process_file): Tweak generated parentheses. Modified: subversion/trunk/build/transform_sql.py Modified:

svn commit: r1159103 - in /subversion/branches/1.7.x-r1159093: ./ build/transform_sql.py subversion/libsvn_wc/wc-queries.sql

Author: danielsh Date: Thu Aug 18 09:12:31 2011 New Revision: 1159103 URL: http://svn.apache.org/viewvc?rev=1159103view=rev Log: On the 1.7.x-r1159093 branch, merge r1159098 r1159101 from trunk. Modified: subversion/branches/1.7.x-r1159093/ (props changed)

svn commit: r1159104 - /subversion/branches/1.7.x/STATUS

Author: danielsh Date: Thu Aug 18 09:13:47 2011 New Revision: 1159104 URL: http://svn.apache.org/viewvc?rev=1159104view=rev Log: Nominate the r1159093 group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1159113 - /subversion/trunk/build/transform_sql.py

Author: danielsh Date: Thu Aug 18 09:36:04 2011 New Revision: 1159113 URL: http://svn.apache.org/viewvc?rev=1159113view=rev Log: * build/transform_sql.py (Processor.process_file): Document the magic number^W^Wmagic string '0'. Modified: subversion/trunk/build/transform_sql.py Modified:

svn commit: r1159122 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

Author: rhuijben Date: Thu Aug 18 09:54:20 2011 New Revision: 1159122 URL: http://svn.apache.org/viewvc?rev=1159122view=rev Log: Document and fix an assumption broken by r1157246. (Note that this didn't cause any issues yet, because the function with the assumption didn't use

svn commit: r1159132 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

Author: rhuijben Date: Thu Aug 18 10:16:53 2011 New Revision: 1159132 URL: http://svn.apache.org/viewvc?rev=1159132view=rev Log: In the ra_serf commit handler, rename the name fields of a few batons to relpath to make it visible that they really contain a path instead of just a name. This patch

svn commit: r1159136 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

Author: rhuijben Date: Thu Aug 18 10:19:51 2011 New Revision: 1159136 URL: http://svn.apache.org/viewvc?rev=1159136view=rev Log: * subversion/libsvn_ra_serf/commit.c (relative_dir_path, relative_file_path): Remove functions that just tried to calculate the already stored relpath by

svn commit: r1159148 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

Author: rhuijben Date: Thu Aug 18 10:37:42 2011 New Revision: 1159148 URL: http://svn.apache.org/viewvc?rev=1159148view=rev Log: Following up on r1159132, reintroduce a name variable in the file and directory batons of the ra_serf commit handler to avoid several calls to obtain this value. Fixing

svn commit: r1159150 - /subversion/branches/1.7.x/STATUS

Author: rhuijben Date: Thu Aug 18 10:44:02 2011 New Revision: 1159150 URL: http://svn.apache.org/viewvc?rev=1159150view=rev Log: * STATUS: Nominate a new serf patch Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn propchange: r1159136 - svn:log

Author: rhuijben Revision: 1159136 Modified property: svn:log Modified: svn:log at Thu Aug 18 10:44:36 2011 -- --- svn:log (original) +++ svn:log Thu Aug 18 10:44:36 2011 @@ -3,3 +3,5 @@ Remove functions that just

svn commit: r1159181 - /subversion/branches/1.7.x/STATUS

Author: stsp Date: Thu Aug 18 11:49:28 2011 New Revision: 1159181 URL: http://svn.apache.org/viewvc?rev=1159181view=rev Log: * STATUS: Add a -0 vote for 1.7.x-r1159093 branch. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1159199 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Author: stsp Date: Thu Aug 18 12:56:12 2011 New Revision: 1159199 URL: http://svn.apache.org/viewvc?rev=1159199view=rev Log: * subversion/libsvn_wc/wc-metadata.sql (NODES): Update docstrings for moved_to and moved_here columns. Modified:

svn commit: r1159200 - /subversion/trunk/notes/moves

Author: stsp Date: Thu Aug 18 12:57:04 2011 New Revision: 1159200 URL: http://svn.apache.org/viewvc?rev=1159200view=rev Log: * notes/moves: Update these nodes to the current state of things. Modified: subversion/trunk/notes/moves Modified: subversion/trunk/notes/moves URL:

svn propchange: r1159200 - svn:log

Author: stsp Revision: 1159200 Modified property: svn:log Modified: svn:log at Thu Aug 18 13:02:38 2011 -- --- svn:log (original) +++ svn:log Thu Aug 18 13:02:38 2011 @@ -1 +1 @@ -* notes/moves: Update these nodes to the

svn commit: r1159206 - /subversion/branches/1.7.x/STATUS

Author: cmpilato Date: Thu Aug 18 13:24:05 2011 New Revision: 1159206 URL: http://svn.apache.org/viewvc?rev=1159206view=rev Log: Cast some votes (and update some others which needed additional review). Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS

svn commit: r1159212 - /subversion/branches/1.7.x-JavaHL-pools/

Author: rhuijben Date: Thu Aug 18 13:34:16 2011 New Revision: 1159212 URL: http://svn.apache.org/viewvc?rev=1159212view=rev Log: Remove already integrated branch (r1158724) Removed: subversion/branches/1.7.x-JavaHL-pools/

svn commit: r1159223 - in /subversion/branches/1.7.x: ./ STATUS build/generator/gen_make.py

Author: hwright Date: Thu Aug 18 13:57:59 2011 New Revision: 1159223 URL: http://svn.apache.org/viewvc?rev=1159223view=rev Log: Merge r1148083, r1148094 from trunk: * r1148083, r1148094 Preload libsvn_auth_gnome_keyring and libsvn_auth_kwallet in locally built executables.

svn commit: r1159224 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/ra_serf.h subversion/libsvn_ra_serf/util.c

Author: hwright Date: Thu Aug 18 14:00:08 2011 New Revision: 1159224 URL: http://svn.apache.org/viewvc?rev=1159224view=rev Log: Reintegrate the 1.7.x-r1155160 branch: * r1155160 When serf restarts a web request, start parsing xml where we stopped in the previous request to avoid xml parse

svn commit: r1159226 - in /subversion/branches/1.7.x: ./ STATUS subversion/svnversion/main.c subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnversion_tests.py

Author: hwright Date: Thu Aug 18 14:02:57 2011 New Revision: 1159226 URL: http://svn.apache.org/viewvc?rev=1159226view=rev Log: Merge r1158196, r1158201, r1158207, r1158209, r1158210, r1158217 from trunk: * r1158196, r1158201, r1158207, r1158209, r1158210, r1158217 Fix another variant of

svn commit: r1159227 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/cat.c subversion/libsvn_client/client.h subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tests.p

Author: hwright Date: Thu Aug 18 14:05:35 2011 New Revision: 1159227 URL: http://svn.apache.org/viewvc?rev=1159227view=rev Log: Merge r1158407, r1158419, r1158854 from trunk: * r1158407, r1158419, r1158854 Fix issue #3989 'merge which deletes file with native eol-style raises spurious

svn commit: r1159228 - /subversion/trunk/subversion/mod_dav_svn/liveprops.c

Author: danielsh Date: Thu Aug 18 14:05:45 2011 New Revision: 1159228 URL: http://svn.apache.org/viewvc?rev=1159228view=rev Log: For issue #2872, log (at APLOG_WARNING) invalid svn:mime-type properties being attempted to be set. Do not add comparable logging to the other instance of

svn commit: r1159229 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/blame.c

Author: hwright Date: Thu Aug 18 14:06:54 2011 New Revision: 1159229 URL: http://svn.apache.org/viewvc?rev=1159229view=rev Log: Merge r1158893 from trunk: * r1158893 Make sure that serf doesn't insert a final '\0' in a property value retrieved via svn_ra_get_file_revs(). Justification:

svn commit: r1159230 - /subversion/trunk/subversion/libsvn_subr/validate.c

Author: danielsh Date: Thu Aug 18 14:08:07 2011 New Revision: 1159230 URL: http://svn.apache.org/viewvc?rev=1159230view=rev Log: Fix issue #2872, 'committers can set arbitrary HTTP Headers on any file': * subversion/libsvn_subr/validate.c (svn_mime_type_validate): Validate that nothing in

svn propchange: r1159136 - svn:log

Author: rhuijben Revision: 1159136 Modified property: svn:log Modified: svn:log at Thu Aug 18 14:09:27 2011 -- --- svn:log (original) +++ svn:log Thu Aug 18 14:09:27 2011 @@ -2,6 +2,7 @@ (relative_dir_path,

svn commit: r1159234 - in /subversion/branches/1.7.x: ./ STATUS build/transform_sql.py subversion/libsvn_wc/wc-queries.sql

Author: hwright Date: Thu Aug 18 14:11:32 2011 New Revision: 1159234 URL: http://svn.apache.org/viewvc?rev=1159234view=rev Log: Reintegrate the 1.7.x-r1159093 branch: * r1159093 Use a macro in wc-queries.sql. Justification: Source code readability. Avoid conflicts in future

svn commit: r1159236 - /subversion/branches/1.7.x-r1159093/

Author: hwright Date: Thu Aug 18 14:13:11 2011 New Revision: 1159236 URL: http://svn.apache.org/viewvc?rev=1159236view=rev Log: Remove the 1.7.x-r1159093 branch, reintegrated in r1159234. Removed: subversion/branches/1.7.x-r1159093/

svn commit: r1159237 - /subversion/branches/hold/

Author: neels Date: Thu Aug 18 14:13:28 2011 New Revision: 1159237 URL: http://svn.apache.org/viewvc?rev=1159237view=rev Log: Create branch for 'svn:hold' feature (issue #3028). Added: subversion/branches/hold/ (props changed) - copied from r1159236, subversion/trunk/ Propchange:

svn commit: r1159240 - in /subversion/branches/hold/subversion: include/private/svn_wc_private.h include/svn_props.h libsvn_client/commit_util.c libsvn_wc/node.c

Author: neels Date: Thu Aug 18 14:24:12 2011 New Revision: 1159240 URL: http://svn.apache.org/viewvc?rev=1159240view=rev Log: On 'hold' branch: Block commits for files that have the 'svn:hold' prop. * subversion/include/svn_props.h (SVN_PROP_HOLD): New #define. *

svn commit: r1159267 - /subversion/branches/1.7.x/STATUS

Author: arfrever Date: Thu Aug 18 14:56:38 2011 New Revision: 1159267 URL: http://svn.apache.org/viewvc?rev=1159267view=rev Log: * STATUS: Vote for some revisions and unnominate a revision, which doesn't need to be backported. Modified: subversion/branches/1.7.x/STATUS Modified:

svn commit: r1159275 - /subversion/trunk/CHANGES

Author: stsp Date: Thu Aug 18 15:08:26 2011 New Revision: 1159275 URL: http://svn.apache.org/viewvc?rev=1159275view=rev Log: * CHANGES: fix two typos Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL:

svn commit: r1159282 - /subversion/branches/1.7.x/STATUS

Author: danielsh Date: Thu Aug 18 15:32:41 2011 New Revision: 1159282 URL: http://svn.apache.org/viewvc?rev=1159282view=rev Log: Add Bert's out-of-band vote for r1159230. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1159286 - in /subversion/trunk/subversion: libsvn_client/status.c libsvn_wc/adm_ops.c svn/main.c tests/cmdline/changelist_tests.py

Author: danielsh Date: Thu Aug 18 15:41:24 2011 New Revision: 1159286 URL: http://svn.apache.org/viewvc?rev=1159286view=rev Log: Fix issue #3348, 'Provide syntax which means include all files not in a changelist'. [ Question: why is filtering done twice, both in adm_ops.c and in status.c? ] *

svn commit: r1159299 - /subversion/trunk/subversion/tests/cmdline/changelist_tests.py

Author: danielsh Date: Thu Aug 18 16:21:31 2011 New Revision: 1159299 URL: http://svn.apache.org/viewvc?rev=1159299view=rev Log: Blindly attempt to fix the windows buildbot. * subversion/tests/cmdline/changelist_tests.py (empty_pseudo_changelist): Respect os.path.sep. Modified:

svn commit: r1159359 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

Author: stsp Date: Thu Aug 18 19:07:47 2011 New Revision: 1159359 URL: http://svn.apache.org/viewvc?rev=1159359view=rev Log: Do not destroy moved-to information when updating BASE nodes. * subversion/libsvn_wc/wc-queries.sql (STMT_SELECT_BASE_NODE, STMT_SELECT_BASE_NODE_WITH_LOCK): Return the

svn commit: r1159362 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/tree_conflicts.c libsvn_wc/update_editor.c svn/tree-conflicts.c

Author: stsp Date: Thu Aug 18 19:14:48 2011 New Revision: 1159362 URL: http://svn.apache.org/viewvc?rev=1159362view=rev Log: Record local moves in tree-conflict data, stop recording them as deletes. This only affects tree conflicts during updates, for now. * subversion/include/svn_wc.h

svn propchange: r1159362 - svn:log

Author: stsp Revision: 1159362 Modified property: svn:log Modified: svn:log at Thu Aug 18 19:15:31 2011 -- --- svn:log (original) +++ svn:log Thu Aug 18 19:15:31 2011 @@ -1,4 +1,4 @@ -Record local moves in tree-conflict

svn commit: r1159365 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/validate.c

Author: hwright Date: Thu Aug 18 19:22:46 2011 New Revision: 1159365 URL: http://svn.apache.org/viewvc?rev=1159365view=rev Log: Merge r1159230 from trunk: * r1159230 Fix issue #2872: Don't let committers set arbitrary HTTP headers on files. Votes: +1: danielsh, arfrever, rhuijben

svn commit: r1159366 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/workqueue.c

Author: hwright Date: Thu Aug 18 19:25:35 2011 New Revision: 1159366 URL: http://svn.apache.org/viewvc?rev=1159366view=rev Log: Merge r1158616 from trunk: * r1158616 Recreate missing directories on file install errors. Justification: Trivial patch that fixes a variable reference in a

svn commit: r1159367 - /subversion/trunk/notes/moves

Author: stsp Date: Thu Aug 18 19:27:12 2011 New Revision: 1159367 URL: http://svn.apache.org/viewvc?rev=1159367view=rev Log: * notes/moves: typo and formatting fixes Modified: subversion/trunk/notes/moves Modified: subversion/trunk/notes/moves URL:

svn commit: r1159377 - /subversion/site/publish/packages.html

Author: stsp Date: Thu Aug 18 19:45:46 2011 New Revision: 1159377 URL: http://svn.apache.org/viewvc?rev=1159377view=rev Log: * site/publish/packages.html: Fix internal link. #pre-releases - #pre-release Modified: subversion/site/publish/packages.html Modified:

svn commit: r1159386 - /subversion/site/publish/packages.html

Author: stsp Date: Thu Aug 18 20:04:07 2011 New Revision: 1159386 URL: http://svn.apache.org/viewvc?rev=1159386view=rev Log: * site/publish/packages.html: Use a much better link to the OpenSUSE pre-release packages. This one sends folks directly to the download page. Modified:

svn commit: r1159400 - /subversion/trunk/subversion/svn/main.c

Author: stsp Date: Thu Aug 18 20:16:14 2011 New Revision: 1159400 URL: http://svn.apache.org/viewvc?rev=1159400view=rev Log: * subversion/svn/main.c (svn_cl__cmd_table): In the 'svn patch' help text, mention a neat trick that allows resolving patch conflicts interactively in some situations.

svn commit: r1159401 - /subversion/branches/1.7.x/STATUS

Author: stsp Date: Thu Aug 18 20:19:01 2011 New Revision: 1159401 URL: http://svn.apache.org/viewvc?rev=1159401view=rev Log: * STATUS: Nominate r1159400. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1159403 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

Author: pburba Date: Thu Aug 18 20:21:35 2011 New Revision: 1159403 URL: http://svn.apache.org/viewvc?rev=1159403view=rev Log: * subversion/tests/cmdline/merge_reintegrate_tests.py (reintegrate_with_subtree_mergeinfo): Remove a meaningless comment which originated with a cut-and-paste

svn commit: r1159451 - /subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c

Author: hwright Date: Fri Aug 19 00:12:46 2011 New Revision: 1159451 URL: http://svn.apache.org/viewvc?rev=1159451view=rev Log: On the fs-py branch: * subversion/libsvn_fs_py/fs_fs.c (read_config): Remove unused function. Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c

svn commit: r1159464 - in /subversion/branches/hold/subversion: include/svn_client.h libsvn_client/client.h libsvn_client/commit.c libsvn_client/commit_util.c svn/cl.h svn/commit-cmd.c svn/main.c

Author: neels Date: Fri Aug 19 00:54:01 2011 New Revision: 1159464 URL: http://svn.apache.org/viewvc?rev=1159464view=rev Log: On branch 'hold': Add --ignore-hold option to 'svn commit'. * subversion/include/svn_client.h, * subversion/libsvn_client/commit.c (svn_client_commit6): New

svn propchange: r1159464 - svn:log

Author: neels Revision: 1159464 Modified property: svn:log Modified: svn:log at Fri Aug 19 02:57:35 2011 -- --- svn:log (original) +++ svn:log Fri Aug 19 02:57:35 2011 @@ -10,7 +10,7 @@ On branch 'hold': Add --ignore-hold

svn commit: r1159488 - in /subversion/branches/hold/subversion: include/svn_client.h libsvn_client/client.h libsvn_client/commit.c libsvn_client/commit_util.c svn/cl.h svn/commit-cmd.c svn/main.c

Author: neels Date: Fri Aug 19 02:58:18 2011 New Revision: 1159488 URL: http://svn.apache.org/viewvc?rev=1159488view=rev Log: On branch 'hold': Realized that the naming --ignore-hold sucks. It could mean ignore the hold semantics, or it could mean ignore the files on hold, or it could mean don't