svn commit: r1152115 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: hwright Date: Fri Jul 29 06:05:52 2011 New Revision: 1152115 URL: http://svn.apache.org/viewvc?rev=1152115view=rev Log: Add a couple of tests in followup to r1152026. (There's probably an issue this is associated with, but I'm not sure which one it is. If you know, please update the

Re: svn commit: r1152026 - /subversion/trunk/subversion/libsvn_client/commit.c

On Thu, Jul 28, 2011 at 3:35 PM, s...@apache.org wrote: Author: stsp Date: Thu Jul 28 22:35:57 2011 New Revision: 1152026 URL: http://svn.apache.org/viewvc?rev=1152026view=rev Log: Make commit refuse to commit the copied-half of a move independently of the delete-half. It is still

svn commit: r1152117 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: danielsh Date: Fri Jul 29 06:26:08 2011 New Revision: 1152117 URL: http://svn.apache.org/viewvc?rev=1152117view=rev Log: * subversion/tests/cmdline/copy_tests.py (commit_copied_half_of_move, commit_deleted_half_of_move): Don't create a repository for these tests. Modified:

svn commit: r1152129 - /subversion/trunk/subversion/libsvn_subr/svn_cache_config.c

Author: danielsh Date: Fri Jul 29 07:36:34 2011 New Revision: 1152129 URL: http://svn.apache.org/viewvc?rev=1152129view=rev Log: Plug a memory leak. * subversion/libsvn_subr/svn_cache_config.c (svn_cache__get_global_membuffer_cache): Set the allocator's owner so that it is freed. Review

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

Author: danielsh Date: Fri Jul 29 07:38:22 2011 New Revision: 1152131 URL: http://svn.apache.org/viewvc?rev=1152131view=rev Log: Nominate r1152129. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1152140 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rhuijben Date: Fri Jul 29 08:13:49 2011 New Revision: 1152140 URL: http://svn.apache.org/viewvc?rev=1152140view=rev Log: * subversion/libsvn_client/merge.c (merge_reintegrate_locked): Open the source ra session with the function that can translate revisions instead of trying to

svn commit: r1152142 - /subversion/trunk/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh

Author: danielsh Date: Fri Jul 29 08:33:00 2011 New Revision: 1152142 URL: http://svn.apache.org/viewvc?rev=1152142view=rev Log: Resolve an old TODO. * subversion/tests/libsvn_wc/create_wc_for_upgrade.sh: Teach the code a little Greek. Modified:

svn propchange: r1152115 - svn:log

Author: stsp Revision: 1152115 Modified property: svn:log Modified: svn:log at Fri Jul 29 09:42:46 2011 -- --- svn:log (original) +++ svn:log Fri Jul 29 09:42:46 2011 @@ -1,7 +1,6 @@ Add a couple of tests in followup to

svn commit: r1152153 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: stsp Date: Fri Jul 29 09:55:26 2011 New Revision: 1152153 URL: http://svn.apache.org/viewvc?rev=1152153view=rev Log: * subversion/tests/cmdline/copy_tests.py (commit_copied_half_of_move, commit_deleted_half_of_move): Add issue number. Modified:

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

Author: stsp Date: Fri Jul 29 10:07:20 2011 New Revision: 1152154 URL: http://svn.apache.org/viewvc?rev=1152154view=rev Log: * STATUS: Vote for r1152129. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

Author: rhuijben Date: Fri Jul 29 11:33:16 2011 New Revision: 1152172 URL: http://svn.apache.org/viewvc?rev=1152172view=rev Log: * STATUS: Cast vote. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn propchange: r1151270 - svn:log

Author: arfrever Revision: 1151270 Modified property: svn:log Modified: svn:log at Fri Jul 29 12:04:20 2011 -- --- svn:log (original) +++ svn:log Fri Jul 29 12:04:20 2011 @@ -1,6 +1,6 @@ -Use gnugp.py module to interact

svn commit: r1152189 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: rhuijben Date: Fri Jul 29 12:46:38 2011 New Revision: 1152189 URL: http://svn.apache.org/viewvc?rev=1152189view=rev Log: Add a test on copying a deleted node which happens to exist on disk. Currently this tests raises an assertion on 1.7.x and trunk. *

svn commit: r1152190 - in /subversion/trunk/subversion: libsvn_wc/copy.c tests/cmdline/copy_tests.py

Author: rhuijben Date: Fri Jul 29 12:47:52 2011 New Revision: 1152190 URL: http://svn.apache.org/viewvc?rev=1152190view=rev Log: * subversion/libsvn_wc/copy.c (copy_or_move): Deny deleting nodes that don't exist in the working copy. * subversion/tests/cmdline/copy_tests.py

svn propchange: r1152193 - svn:log

Author: rhuijben Revision: 1152193 Modified property: svn:log Modified: svn:log at Fri Jul 29 12:55:57 2011 -- --- svn:log (original) +++ svn:log Fri Jul 29 12:55:57 2011 @@ -1 +1 @@ -* STATUS: Nominate rr1152189,

svn commit: r1152204 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_wc/node.c

Author: stsp Date: Fri Jul 29 13:12:39 2011 New Revision: 1152204 URL: http://svn.apache.org/viewvc?rev=1152204view=rev Log: Add a new internal API function: svn_wc__node_get_deleted_ancestor(). This will be needed for handling moves during commit processing. *

svn commit: r1152245 - in /subversion/trunk/subversion: libsvn_client/commit.c libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 14:48:18 2011 New Revision: 1152245 URL: http://svn.apache.org/viewvc?rev=1152245view=rev Log: Update moved-to information on the BASE path of a node which is being moved out of, or within, an existing moved subtree. Also, make 'svn commit' deal with the add-half of

svn commit: r1152246 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: stsp Date: Fri Jul 29 14:50:25 2011 New Revision: 1152246 URL: http://svn.apache.org/viewvc?rev=1152246view=rev Log: * subversion/tests/cmdline/copy_tests.py (commit_deleted_half_of_nested_move, test_list): New XFail test which shows a case where recording of moved-to information

svn commit: r1152260 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/svn_cache_config.c

Author: hwright Date: Fri Jul 29 15:19:21 2011 New Revision: 1152260 URL: http://svn.apache.org/viewvc?rev=1152260view=rev Log: Merge r1152129 from trunk: * r1152129 Plug a memory leak. Justification: Use the APR API properly. Resolves a valgrind warning. Votes: +1:

svn commit: r1152261 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/adm_ops.c subversion/tests/cmdline/special_tests.py

Author: hwright Date: Fri Jul 29 15:20:55 2011 New Revision: 1152261 URL: http://svn.apache.org/viewvc?rev=1152261view=rev Log: Merge r1150812 from trunk: * r1150812 Issue 3972, spurious revert notification on symlinks Justification: A regression from 1.6. Votes: +1: philip,

svn commit: r1152267 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

Author: pburba Date: Fri Jul 29 15:35:14 2011 New Revision: 1152267 URL: http://svn.apache.org/viewvc?rev=1152267view=rev Log: Add a test for issue #3975 'adds with explicit mergeinfo don't get mergeinfo describing merge which added them'. * subversion/tests/cmdline/merge_tests.py

svn commit: r1152282 - /subversion/trunk/subversion/libsvn_repos/log.c

Author: philip Date: Fri Jul 29 15:50:09 2011 New Revision: 1152282 URL: http://svn.apache.org/viewvc?rev=1152282view=rev Log: Improve the performance of log -g by avoiding scanning the same set of paths/ranges more than once. * subversion/libsvn_repos/log.c (get_combined_mergeinfo_changes):

svn commit: r1152286 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

Author: pburba Date: Fri Jul 29 15:59:14 2011 New Revision: 1152286 URL: http://svn.apache.org/viewvc?rev=1152286view=rev Log: * subversion/tests/cmdline/merge_tests.py (merge_adds_subtree_with_mergeinfo): Follow-up to r1152267, set to XFail, issue #3975 is still open. Modified:

svn commit: r1152293 - in /subversion/trunk/subversion: libsvn_wc/wc-queries.sql libsvn_wc/wc_db.c tests/cmdline/copy_tests.py

Author: stsp Date: Fri Jul 29 16:25:06 2011 New Revision: 1152293 URL: http://svn.apache.org/viewvc?rev=1152293view=rev Log: Fix the problem that prevented copy_test 106 (nested moves) from passing. * subversion/libsvn_wc/wc_db.c (op_delete_txn): If a subtree is being moved-away, update

svn commit: r1152294 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 16:28:11 2011 New Revision: 1152294 URL: http://svn.apache.org/viewvc?rev=1152294view=rev Log: * subversion/libsvn_wc/wc_db.c (op_delete_txn): Add a debug assertion that fails if a move has been recorded incorrectly. Modified:

svn commit: r1152297 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: philip Date: Fri Jul 29 16:32:59 2011 New Revision: 1152297 URL: http://svn.apache.org/viewvc?rev=1152297view=rev Log: * subversion/tests/cmdline/copy_tests.py (copy_deleted_dir): Tweak comment. Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py Modified:

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

Author: philip Date: Fri Jul 29 16:48:43 2011 New Revision: 1152299 URL: http://svn.apache.org/viewvc?rev=1152299view=rev Log: * STATUS: note merge conflict Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1152300 - in /subversion/trunk/subversion: libsvn_wc/wc-queries.sql libsvn_wc/wc_db.c tests/cmdline/copy_tests.py

Author: stsp Date: Fri Jul 29 16:53:01 2011 New Revision: 1152300 URL: http://svn.apache.org/viewvc?rev=1152300view=rev Log: Temporarily revert r1152293 and r1152294. r1152293 is causing test failures. Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql

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

Author: hwright Date: Fri Jul 29 17:16:19 2011 New Revision: 1152305 URL: http://svn.apache.org/viewvc?rev=1152305view=rev Log: * STATUS: Votey votey, artichokey. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1152307 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/blame.c

Author: hwright Date: Fri Jul 29 17:22:33 2011 New Revision: 1152307 URL: http://svn.apache.org/viewvc?rev=1152307view=rev Log: Merge r1150242 from trunk: * r1150242 Make blame close its temporary files before deleting them. Justification: Hitting the io retry loop on windows is very

svn commit: r1152308 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/subst.c

Author: hwright Date: Fri Jul 29 17:28:11 2011 New Revision: 1152308 URL: http://svn.apache.org/viewvc?rev=1152308view=rev Log: Merge r1150441 from trunk: * r1150441 Closing a translated stream should close the inner stream. Justification: Resolves an open file handle problem on

svn commit: r1152324 - in /subversion/trunk/subversion: libsvn_wc/wc-queries.sql libsvn_wc/wc_db.c tests/cmdline/copy_tests.py

Author: stsp Date: Fri Jul 29 17:46:16 2011 New Revision: 1152324 URL: http://svn.apache.org/viewvc?rev=1152324view=rev Log: Restore the changes from r1152293 (which see for log full message), including the following fix: * subversion/libsvn_wc/wc-queries.sql (STMT_SELECT_MOVED_HERE_CHILDREN):

svn commit: r1152326 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 17:48:18 2011 New Revision: 1152326 URL: http://svn.apache.org/viewvc?rev=1152326view=rev Log: Restore r1152294 (which see for full log message) unchanged. Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c Modified:

svn propchange: r1152324 - svn:log

Author: stsp Revision: 1152324 Modified property: svn:log Modified: svn:log at Fri Jul 29 17:48:58 2011 -- --- svn:log (original) +++ svn:log Fri Jul 29 17:48:58 2011 @@ -1,4 +1,4 @@ -Restore the changes from r1152293

svn commit: r1152332 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 18:19:24 2011 New Revision: 1152332 URL: http://svn.apache.org/viewvc?rev=1152332view=rev Log: Follow-up to r1152294: * subversion/libsvn_wc/wc_db.c: Use #ifdef SVN_DEBUG, not #if SVN_DEBUG. Found by: danielsh Modified:

svn propchange: r1152326 - svn:log

Author: stsp Revision: 1152326 Modified property: svn:log Modified: svn:log at Fri Jul 29 18:58:06 2011 -- --- svn:log (original) +++ svn:log Fri Jul 29 18:58:06 2011 @@ -1 +1,2 @@ -Restore r1152294 (which see for full

svn commit: r1152341 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

Author: rhuijben Date: Fri Jul 29 19:17:26 2011 New Revision: 1152341 URL: http://svn.apache.org/viewvc?rev=1152341view=rev Log: * subversion/tests/cmdline/copy_tests.py (commit_copied_half_of_nested_move): Escape paths to fix test on Windows. Modified:

svn commit: r1152345 - in /subversion/trunk/subversion: libsvn_wc/entries.c libsvn_wc/info.c libsvn_wc/node.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h tests/libsvn_wc/db-test.c

Author: stsp Date: Fri Jul 29 19:33:13 2011 New Revision: 1152345 URL: http://svn.apache.org/viewvc?rev=1152345view=rev Log: Extend svn_wc__db_scan_deletion() to return the moved-to path of of a moved node, if requested, in MOVED_TO_ABSPATH. This function already returned the op-root of the

svn commit: r1152347 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/replay.c

Author: lgo Date: Fri Jul 29 19:35:39 2011 New Revision: 1152347 URL: http://svn.apache.org/viewvc?rev=1152347view=rev Log: * STATUS: propose r1150506, r1150853 for backport. Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS

svn commit: r1152348 - in /subversion/trunk/subversion: libsvn_wc/entries.c libsvn_wc/info.c libsvn_wc/node.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h tests/libsvn_wc/db-test.c

Author: stsp Date: Fri Jul 29 19:35:45 2011 New Revision: 1152348 URL: http://svn.apache.org/viewvc?rev=1152348view=rev Log: Whoops, revert the just-committed r1152345, it wasn't quite ready yet. Modified: subversion/trunk/subversion/libsvn_wc/entries.c

svn commit: r1152353 - /subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c

Author: lgo Date: Fri Jul 29 19:50:12 2011 New Revision: 1152353 URL: http://svn.apache.org/viewvc?rev=1152353view=rev Log: * subversion/libsvn_ra_serf/replay.c: revert part of r1152347 that wasn't supposed to be committed (yet). Modified:

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

Author: rhuijben Date: Fri Jul 29 19:53:30 2011 New Revision: 1152354 URL: http://svn.apache.org/viewvc?rev=1152354view=rev Log: * STATUS: Cast 2 votes. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

Author: rhuijben Date: Fri Jul 29 19:54:52 2011 New Revision: 1152356 URL: http://svn.apache.org/viewvc?rev=1152356view=rev Log: * STATUS: Following up on r1152354, really cast 2nd vote. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1152358 - /subversion/trunk/tools/dist/backport.pl

Author: danielsh Date: Fri Jul 29 19:57:35 2011 New Revision: 1152358 URL: http://svn.apache.org/viewvc?rev=1152358view=rev Log: Plug an infinite loop. * tools/dist/backport.pl (parse_entry): Use more liberal regexes. Modified: subversion/trunk/tools/dist/backport.pl Modified:

svn commit: r1152360 - /subversion/trunk/tools/dist/backport.pl

Author: danielsh Date: Fri Jul 29 20:00:04 2011 New Revision: 1152360 URL: http://svn.apache.org/viewvc?rev=1152360view=rev Log: Fix an infinite loop. * tools/dist/backport.pl (parse_entry): Guard the loop condition. Tested by: none Modified: subversion/trunk/tools/dist/backport.pl

svn commit: r1152361 - /subversion/branches/1.7.x/

Author: danielsh Date: Fri Jul 29 20:04:39 2011 New Revision: 1152361 URL: http://svn.apache.org/viewvc?rev=1152361view=rev Log: Record the reverse merging of r1150506 r1150853 done in r1152353. Client: 1.7.0-beta1 Modified: subversion/branches/1.7.x/ (props changed) Propchange:

svn commit: r1152364 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 20:15:00 2011 New Revision: 1152364 URL: http://svn.apache.org/viewvc?rev=1152364view=rev Log: * subversion/libsvn_wc/wc_db.c (op_delete_txn): Always initialise local variables MOVED_FROM_RELPATH, CHILED_MOVED_FROM_RELPATH, and CHILD_DELETE_OP_ROOT_RELPATH.

svn commit: r1152368 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp Date: Fri Jul 29 20:36:13 2011 New Revision: 1152368 URL: http://svn.apache.org/viewvc?rev=1152368view=rev Log: * subversion/libsvn_wc/wc_db.c (op_delete_txn): Reset open SQLite statements when returning errors that aren't coming from the svn_sqlite__ API. Found by: rhuijben

svn commit: r1152409 - in /subversion/branches/1.7.x: ./ STATUS subversion/svndumpfilter/main.c

Author: hwright Date: Sat Jul 30 01:00:50 2011 New Revision: 1152409 URL: http://svn.apache.org/viewvc?rev=1152409view=rev Log: Merge r1151911 from trunk: * r1151911 Fix description of svndumpfilter's --targets option. Votes: +1: cmpilato, hwright, rhuijben Modified: