svn commit: r1158981 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: neels Date: Thu Aug 18 01:03:12 2011 New Revision: 1158981 URL: http://svn.apache.org/viewvc?rev=1158981&view=rev Log: When reverting the add half of a move: fix clearing moved-to on the dir target of a recursive move. * subversion/libsvn_wc/wc_db.c (op_revert_recursive_txn): Add missing call to clear_moved_to() for the target itself (the parent of the recursion). (Also make sure OP_DEPTH is not overwritten and still available for evaluation at the bottom.) Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1158981&r1=1158980&r2=1158981&view=diff == --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Aug 18 01:03:12 2011 @@ -5325,6 +5325,8 @@ op_revert_recursive_txn(void *baton, svn_sqlite__stmt_t *stmt; svn_boolean_t have_row; apr_int64_t op_depth; + apr_int64_t select_op_depth; + svn_boolean_t moved_here; int affected_rows; apr_pool_t *iterpool; @@ -5356,6 +5358,7 @@ op_revert_recursive_txn(void *baton, } op_depth = svn_sqlite__column_int64(stmt, 0); + moved_here = svn_sqlite__column_boolean(stmt, 15); SVN_ERR(svn_sqlite__reset(stmt)); if (op_depth > 0 && op_depth != relpath_depth(local_relpath)) @@ -5366,13 +5369,13 @@ op_revert_recursive_txn(void *baton, local_relpath, scratch_pool)); - if (!op_depth) -op_depth = 1; /* Don't delete BASE nodes */ + /* Don't delete BASE nodes */ + select_op_depth = op_depth ? op_depth : 1; SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, STMT_DELETE_NODES_RECURSIVE)); SVN_ERR(svn_sqlite__bindf(stmt, "isi", wcroot->wc_id, -local_relpath, op_depth)); +local_relpath, select_op_depth)); SVN_ERR(svn_sqlite__step_done(stmt)); SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, @@ -5413,7 +5416,12 @@ op_revert_recursive_txn(void *baton, } svn_pool_destroy(iterpool); - /* Clear any moved-to paths of the BASE nodes. */ + /* Clear potential moved-to pointing at the target node itself. */ + if (op_depth > 0 && op_depth == relpath_depth(local_relpath) + && moved_here) +SVN_ERR(clear_moved_to(local_relpath, wcroot, scratch_pool)); + + /* Clear any moved-to paths of potentially 'moved-away' nodes. */ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, STMT_CLEAR_MOVED_TO_RELPATH_RECURSIVE)); SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
svn commit: r1158979 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql
Author: neels Date: Thu Aug 18 00:45:42 2011 New Revision: 1158979 URL: http://svn.apache.org/viewvc?rev=1158979&view=rev Log: Comment. * subversion/libsvn_wc/wc-queries.sql (STMT_SELECT_MOVED_HERE_CHILDREN): Describe all parameters and returned columns. Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1158979&r1=1158978&r2=1158979&view=diff == --- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original) +++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Aug 18 00:45:42 2011 @@ -1365,6 +1365,9 @@ WHERE wc_id = ?1 OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0')) AND op_depth = 0 +/* This statement returns pairs of move-roots below the path ?2 in WC_ID ?1. + * Each row returns a moved-here path (always a child of ?2) in the first + * column, and its matching moved-away (deleted) path in the second column. */ -- STMT_SELECT_MOVED_HERE_CHILDREN SELECT moved_to, local_relpath FROM nodes WHERE wc_id = ?1 AND op_depth = 0
svn commit: r1158970 - /subversion/trunk/subversion/libsvn_wc/status.c
Author: neels Date: Wed Aug 17 23:35:44 2011 New Revision: 1158970 URL: http://svn.apache.org/viewvc?rev=1158970&view=rev Log: * subversion/libsvn_wc/status.c (assemble_status): Remove nonsensical condition, fix bug that omitted moved-here on replaced nodes. Modified: subversion/trunk/subversion/libsvn_wc/status.c Modified: subversion/trunk/subversion/libsvn_wc/status.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1158970&r1=1158969&r2=1158970&view=diff == --- subversion/trunk/subversion/libsvn_wc/status.c (original) +++ subversion/trunk/subversion/libsvn_wc/status.c Wed Aug 17 23:35:44 2011 @@ -666,9 +666,7 @@ assemble_status(svn_wc_status3_t **statu } /* Get moved-from info (only for potential op-roots of a move). */ - if (node_status == svn_wc_status_added - && info->moved_here - && info->op_root) + if (info->moved_here && info->op_root) SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &moved_from_abspath,
svn commit: r1158966 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 23:10:27 2011 New Revision: 1158966 URL: http://svn.apache.org/viewvc?rev=1158966&view=rev Log: * STATUS: Fix description of r1158617 group, it's for files and directories. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158966&r1=1158965&r2=1158966&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 23:10:27 2011 @@ -142,7 +142,7 @@ Candidate changes: +1: rhuijben, hwright * r1158617, r1158875, r1158886, r1158896, r1158919, r1158924, r1158963 -Make 'svn revert' remove unversioned files resulting from reverting a copy. +Make 'svn revert' remove unversioned nodes resulting from reverting a copy. Fixes issue #3101. Justification: Bert suggested to backport this to 1.7.
svn commit: r1158965 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 23:07:08 2011 New Revision: 1158965 URL: http://svn.apache.org/viewvc?rev=1158965&view=rev Log: * STATUS: Add r1158963 to r1158617 group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158965&r1=1158964&r2=1158965&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 23:07:08 2011 @@ -141,7 +141,7 @@ Candidate changes: Votes: +1: rhuijben, hwright - * r1158617, r1158875, r1158886, r1158896, r1158919, r1158924 + * r1158617, r1158875, r1158886, r1158896, r1158919, r1158924, r1158963 Make 'svn revert' remove unversioned files resulting from reverting a copy. Fixes issue #3101. Justification: @@ -156,9 +156,10 @@ Candidate changes: the first merge. There are various other cases where the unversioned files get in the way. Notes: - Instead of reviewing the individual commits I would suggest to run - the following merge and review the resulting diff: -svn merge -c1158617,1158875,1158886,1158896,1158919,1158924 \ + All revisions depend on one another, but some amend or even undo changes + made in earlier revisions. Instead of reviewing the individual commits + I would suggest to run the following merge and review the resulting diff: +svn merge -c1158617,1158875,1158886,1158896,1158919,1158924,1158963 \ ^/subversion/trunk Votes: +1: stsp (but only if this gets into 1.7.0)
svn commit: r1158963 - in /subversion/trunk/subversion/libsvn_wc: questions.c wc.h
Author: stsp
Date: Wed Aug 17 22:58:21 2011
New Revision: 1158963
URL: http://svn.apache.org/viewvc?rev=1158963&view=rev
Log:
Revert a function rename made in r1158617 that is unnecessary as of r1158875.
* subversion/libsvn_wc/wc.h
(svn_wc__compare_file_with_pristine): Remove declaration.
* subversion/libsvn_wc/questions.c
(svn_wc__compare_file_with_pristine): Rename this function back to ...
(compare_and_verify): ... this, and make it private to this file again.
Modified:
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1158963&r1=1158962&r2=1158963&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Wed Aug 17 22:58:21 2011
@@ -79,17 +79,38 @@
*/
-svn_error_t *
-svn_wc__compare_file_with_pristine(svn_boolean_t *modified_p,
- svn_wc__db_t *db,
- const char *versioned_file_abspath,
- svn_filesize_t versioned_file_size,
- svn_stream_t *pristine_stream,
- svn_filesize_t pristine_size,
- svn_boolean_t has_props,
- svn_boolean_t props_mod,
- svn_boolean_t exact_comparison,
- apr_pool_t *scratch_pool)
+/* Set *MODIFIED_P to TRUE if (after translation) VERSIONED_FILE_ABSPATH
+ * (of VERSIONED_FILE_SIZE bytes) differs from PRISTINE_STREAM (of
+ * PRISTINE_SIZE bytes), else to FALSE if not.
+ *
+ * If EXACT_COMPARISON is FALSE, translate VERSIONED_FILE_ABSPATH's EOL
+ * style and keywords to repository-normal form according to its properties,
+ * and compare the result with PRISTINE_STREAM. If EXACT_COMPARISON is
+ * TRUE, translate PRISTINE_STREAM's EOL style and keywords to working-copy
+ * form according to VERSIONED_FILE_ABSPATH's properties, and compare the
+ * result with VERSIONED_FILE_ABSPATH.
+ *
+ * HAS_PROPS should be TRUE if the file had properties when it was not
+ * modified, otherwise FALSE.
+ *
+ * PROPS_MOD should be TRUE if the file's properties have been changed,
+ * otherwise FALSE.
+ *
+ * PRISTINE_STREAM will be closed before a successful return.
+ *
+ * DB is a wc_db; use SCRATCH_POOL for temporary allocation.
+ */
+static svn_error_t *
+compare_and_verify(svn_boolean_t *modified_p,
+ svn_wc__db_t *db,
+ const char *versioned_file_abspath,
+ svn_filesize_t versioned_file_size,
+ svn_stream_t *pristine_stream,
+ svn_filesize_t pristine_size,
+ svn_boolean_t has_props,
+ svn_boolean_t props_mod,
+ svn_boolean_t exact_comparison,
+ apr_pool_t *scratch_pool)
{
svn_boolean_t same;
svn_subst_eol_style_t eol_style;
@@ -316,12 +337,12 @@ svn_wc__internal_file_modified_p(svn_boo
/* Check all bytes, and verify checksum if requested. */
{
svn_error_t *err;
-err = svn_wc__compare_file_with_pristine(modified_p, db,
- local_abspath, dirent->filesize,
- pristine_stream, pristine_size,
- has_props, props_mod,
- exact_comparison,
- scratch_pool);
+err = compare_and_verify(modified_p, db,
+ local_abspath, dirent->filesize,
+ pristine_stream, pristine_size,
+ has_props, props_mod,
+ exact_comparison,
+ scratch_pool);
/* At this point we already opened the pristine file, so we know that
the access denied applies to the working copy path */
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1158963&r1=1158962&r2=1158963&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Wed Aug 17 22:58:21 2011
@@ -725,39 +725,6 @@ svn_wc__perform_file_merge(svn_skel_t **
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Set *MODIFIED_P to TRUE if (after translation) VERSIONED_FILE_ABSPATH
- * (of VERSIONED_FILE_SIZE bytes) differs from PRISTINE_STREAM (of
- * PRISTINE_SIZE bytes), else to FALSE if not.
- *
- * If EXACT_COM
svn commit: r1158945 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 22:24:46 2011 New Revision: 1158945 URL: http://svn.apache.org/viewvc?rev=1158945&view=rev Log: * STATUS: Nominate r1158617 and friends and family for backport. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158945&r1=1158944&r2=1158945&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 22:24:46 2011 @@ -141,6 +141,28 @@ Candidate changes: Votes: +1: rhuijben, hwright + * r1158617, r1158875, r1158886, r1158896, r1158919, r1158924 +Make 'svn revert' remove unversioned files resulting from reverting a copy. +Fixes issue #3101. +Justification: + Bert suggested to backport this to 1.7. + I myself am not really sure if we should consider this a bug fix + or a behaviour change. I think we should merge this before 1.7.0 + if we decide to merge it. + It does fix some fairly annoying usability issues. + For instance: If a merge adds files, the merge result is reverted, and + the merge is repeated, the second merge does not produce the same result + as the first merge. It will skip the, now unversioned, files added by + the first merge. There are various other cases where the unversioned + files get in the way. +Notes: + Instead of reviewing the individual commits I would suggest to run + the following merge and review the resulting diff: +svn merge -c1158617,1158875,1158886,1158896,1158919,1158924 \ + ^/subversion/trunk +Votes: + +1: stsp (but only if this gets into 1.7.0) + Veto-blocked changes: =
svn commit: r1158936 - /subversion/trunk/subversion/tests/cmdline/revert_tests.py
Author: neels
Date: Wed Aug 17 22:10:39 2011
New Revision: 1158936
URL: http://svn.apache.org/viewvc?rev=1158936&view=rev
Log:
* subversion/tests/cmdline/revert_tests.py (revert_moved_file):
Issue #876 is rejected. Make the corresponding test not fail and unmark
XFail. Remake the test using svntest.factory. Change the indent to match
the rest of the file.
Modified:
subversion/trunk/subversion/tests/cmdline/revert_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1158936&r1=1158935&r2=1158936&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Wed Aug 17
22:10:39 2011
@@ -368,37 +368,52 @@ def revert_replaced_file_without_props(s
svntest.actions.run_and_verify_status(wc_dir, expected_status)
#--
-# Regression test for issue #876:
-# svn revert of an svn move'd file does not revert the file
-@XFail()
+# Note that issue #876 has been rejected. This now basically tests that
+# reverting the delete side of a move does *not* also revert the copy side.
@Issue(876)
def revert_moved_file(sbox):
-"revert a moved file"
+ "revert a moved file"
+
+ # svntest.factory.make(sbox, """svn mv iota iota_moved
+ # svn st
+ # svn revert iota
+ # svn st
+ # """)
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ iota = os.path.join(wc_dir, 'iota')
+ iota_moved = os.path.join(wc_dir, 'iota_moved')
+
+ # svn mv iota iota_moved
+ expected_stdout = svntest.verify.UnorderedOutput([
+'A ' + iota_moved + '\n',
+'D ' + iota + '\n',
+ ])
+
+ actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mv', iota,
+iota_moved)
+
+ # svn st
+ expected_status = actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({
+'iota_moved': Item(status='A ', copied='+', wc_rev='-'),
+ })
+ expected_status.tweak('iota', status='D ')
+
+ actions.run_and_verify_unquiet_status(wc_dir, expected_status)
+
+ # svn revert iota
+ expected_stdout = ["Reverted '" + iota + "'\n"]
+
+ actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'revert',
+iota)
-sbox.build(read_only = True)
-wc_dir = sbox.wc_dir
-iota_path = os.path.join(wc_dir, 'iota')
-iota_path_moved = os.path.join(wc_dir, 'iota_moved')
-
-svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path,
-iota_path_moved)
-expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
-expected_output.tweak('iota', status='D ')
-expected_output.add({
- 'iota_moved' : Item(status='A ', copied='+', wc_rev='-'),
-})
-svntest.actions.run_and_verify_status(wc_dir, expected_output)
-
-# now revert the file iota
-svntest.actions.run_and_verify_svn(None,
- ["Reverted '" + iota_path + "'\n"], [], 'revert', iota_path)
-
-# at this point, svn status on iota_path_moved should return nothing
-# since it should disappear on reverting the move, and since svn status
-# on a non-existent file returns nothing.
+ # svn st
+ expected_status.tweak('iota', status=' ')
-svntest.actions.run_and_verify_svn(None, [], [],
- 'status', '-v', iota_path_moved)
+ actions.run_and_verify_unquiet_status(wc_dir, expected_status)
#--
svn commit: r1158929 - /subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
Author: danielsh
Date: Wed Aug 17 21:54:50 2011
New Revision: 1158929
URL: http://svn.apache.org/viewvc?rev=1158929&view=rev
Log:
Add a C test for issue #3991.
* subversion/tests/libsvn_diff/parse-diff-test.c
(unidiff_lacking_trailing_eol): New global string.
(test_parse_unidiff_lacking_trailing_eol): New test.
(test_funcs): Run it, XFail.
Modified:
subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
Modified: subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1158929&r1=1158928&r2=1158929&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c Wed Aug 17
21:54:50 2011
@@ -246,6 +246,15 @@ static const char *bad_git_diff_header =
"diff --git a/ b/path 1 b/ b/path 1" NL
"new file mode 100644"NL;
+static const char *unidiff_lacking_trailing_eol =
+ "Index: A/C/gamma"NL
+ "===" NL
+ "--- A/C/gamma\t(revision 2)" NL
+ "+++ A/C/gamma\t(working copy)" NL
+ "@@ -1 +1,2 @@" NL
+ " This is the file 'gamma'." NL
+ "+some more bytes to 'gamma'"; /* Don't add NL after this line */
+
/* Create a PATCH_FILE containing the contents of DIFF. */
static svn_error_t *
@@ -900,6 +909,57 @@ test_git_diffs_with_spaces_diff(apr_pool
SVN_ERR(svn_diff_close_patch_file(patch_file, pool));
return SVN_NO_ERROR;
}
+
+static svn_error_t *
+test_parse_unidiff_lacking_trailing_eol(apr_pool_t *pool)
+{
+ svn_patch_file_t *patch_file;
+ svn_boolean_t reverse;
+ svn_boolean_t ignore_whitespace;
+ int i;
+ apr_pool_t *iterpool;
+
+ reverse = FALSE;
+ ignore_whitespace = FALSE;
+ iterpool = svn_pool_create(pool);
+ for (i = 0; i < 2; i++)
+{
+ svn_patch_t *patch;
+ svn_diff_hunk_t *hunk;
+
+ svn_pool_clear(iterpool);
+
+ SVN_ERR(create_patch_file(&patch_file, unidiff_lacking_trailing_eol,
+pool));
+
+ /* We have one patch with one hunk. Parse it. */
+ SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, reverse,
+ignore_whitespace, iterpool,
+iterpool));
+ SVN_TEST_ASSERT(patch);
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma");
+ SVN_TEST_ASSERT(patch->hunks->nelts == 1);
+
+ hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *);
+ SVN_ERR(check_content(hunk, ! reverse,
+"This is the file 'gamma'." NL,
+pool));
+
+ /* Verify that the contents are as expected, with a NL appended.
+ TODO: test for notification about the NL silently appended */
+ SVN_ERR(check_content(hunk, reverse,
+"This is the file 'gamma'." NL
+"some more bytes to 'gamma'" NL,
+pool));
+
+ reverse = !reverse;
+ SVN_ERR(svn_diff_close_patch_file(patch_file, pool));
+}
+ svn_pool_destroy(iterpool);
+ return SVN_NO_ERROR;
+}
+
/* ==
*/
struct svn_test_descriptor_t test_funcs[] =
@@ -921,5 +981,7 @@ struct svn_test_descriptor_t test_funcs[
"test property diffs with odd symbols"),
SVN_TEST_PASS2(test_git_diffs_with_spaces_diff,
"test git diffs with spaces in paths"),
+SVN_TEST_XFAIL2(test_parse_unidiff_lacking_trailing_eol,
+ "test parsing unidiffs lacking trailing eol"),
SVN_TEST_NULL
};
svn commit: r1158928 - /subversion/branches/fs-py/subversion/python/svn/_lock.py
Author: hwright Date: Wed Aug 17 21:52:51 2011 New Revision: 1158928 URL: http://svn.apache.org/viewvc?rev=1158928&view=rev Log: On the fs-py branch: Add a simple implementation of os-based locking, which will be useful for implementation FSFS locks in Python. This is built such that it should work on multiple OSs, but currently only has a posix implementation. * subversion/python/svn/_lock.py: New. Added: subversion/branches/fs-py/subversion/python/svn/_lock.py (with props) Added: subversion/branches/fs-py/subversion/python/svn/_lock.py URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/python/svn/_lock.py?rev=1158928&view=auto == --- subversion/branches/fs-py/subversion/python/svn/_lock.py (added) +++ subversion/branches/fs-py/subversion/python/svn/_lock.py Wed Aug 17 21:52:51 2011 @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +import os, errno + +import svn +import svn.err + + +# The system-dependent locking bits +if os.name == 'posix': +import fcntl + +def _lock_file(f, exclusive, blocking): +flags = 0 +if not blocking: +flags |= fcntl.LOCK_NB +if exclusive: +flags |= fcntl.LOCK_EX +else: +flags |= fcntl.LOCK_SH + +fcntl.lockf(f, flags) + +def _unlock_file(f): +fcntl.lockf(f, fcntl.LOCK_UN) + +elif os.name == 'nt': +# Need to implement os-level locking for Windows +raise svn.SubversionException(0, "Locking not supported") +else: +raise svn.SubversionException(0, "Locking not supported") + + + +class Lock(object): +def __init__(self, path, exclusive=True, blocking=True): +self._path = path +self._exclusive = exclusive +self._blocking = blocking +self._is_locked = False + +def acquire(self): +### * Should we add a retry loop of some kind? +self._fd = os.open(self._path, os.O_CREAT | os.O_RDWR) +_lock_file(self._fd, self._exclusive, self._blocking) +self._is_locked = True + +def release(self): +if self._is_locked: +_unlock_file(self._fd) +os.close(self._fd) +del self._fd +self._is_locked = False + +def __enter__(self): +if not self._is_locked: +self.acquire() +return self + +def __exit__(self, exc_type, exc_val, exc_tb): +if self._is_locked: +self.release() + +def __del__(self): +'Make sure we release the lock if/when it get garbage collected.' +self.release() Propchange: subversion/branches/fs-py/subversion/python/svn/_lock.py -- svn:eol-style = native
svn commit: r1158924 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: stsp
Date: Wed Aug 17 21:42:20 2011
New Revision: 1158924
URL: http://svn.apache.org/viewvc?rev=1158924&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(revert_restore): Do not use uninitialised variables if read_info() throws
a path-not-found error and we are dealing with the revert of a copy.
Should fix random failures of revert_test 19 on various buildbots.
(Thanks for testing, danielsh!)
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1158924&r1=1158923&r2=1158924&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Aug 17 21:42:20 2011
@@ -1491,6 +1491,16 @@ revert_restore(svn_wc__db_t *db,
scratch_pool));
return SVN_NO_ERROR;
}
+ else
+{
+ /* ### Initialise to values which prevent the code below from
+ * ### trying to restore anything to disk.
+ * ### 'status' should be status_unknown but that doesn't exist. */
+ status = svn_wc__db_status_normal;
+ kind = svn_wc__db_kind_unknown;
+ recorded_size = SVN_INVALID_FILESIZE;
+ recorded_mod_time = 0;
+}
}
else if (err)
return svn_error_trace(err);
svn commit: r1158923 - /subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: danielsh
Date: Wed Aug 17 21:41:22 2011
New Revision: 1158923
URL: http://svn.apache.org/viewvc?rev=1158923&view=rev
Log:
Add a regression test for issue #3991.
* subversion/tests/cmdline/patch_tests.py
(patch_lacking_trailing_eol): New test, XFail.
(test_list): Run it.
Modified:
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1158923&r1=1158922&r2=1158923&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Wed Aug 17
21:41:22 2011
@@ -3615,6 +3615,61 @@ def patch_moved_away(sbox):
1, # check-props
1) # dry-run
+@XFail()
+@Issue(3991)
+def patch_lacking_trailing_eol(sbox):
+ "patch file lacking trailing eol"
+
+ sbox.build(read_only = True)
+ wc_dir = sbox.wc_dir
+
+ patch_file_path = make_patch_path(sbox)
+ iota_path = os.path.join(wc_dir, 'iota')
+ mu_path = os.path.join(wc_dir, 'A', 'mu')
+
+ # Prepare
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+
+ # Apply patch
+ unidiff_patch = [
+"Index: iota\n",
+"===\n",
+"--- iota\t(revision 1)\n",
+"+++ iota\t(working copy)\n",
+# TODO: -1 +1
+"@@ -1 +1,2 @@\n",
+" This is the file 'iota'.\n",
+"+Some more bytes", # No trailing \n on this line!
+ ]
+
+ svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
+
+ gamma_contents = "It is the file 'gamma'.\n"
+ iota_contents = "This is the file 'iota'.\n"
+ new_contents = "new\n"
+
+ expected_output = [
+'U %s\n' % os.path.join(wc_dir, 'iota'),
+'svn: W[0-9]+: .*', # warning about appending a newline to iota's last line
+ ]
+
+ # Expect a newline to be appended
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.tweak('iota', contents=iota_contents+"Some more bytes\n")
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('iota', status='M ')
+
+ expected_skip = wc.State('', { })
+
+ svntest.actions.run_and_verify_patch(wc_dir,
os.path.abspath(patch_file_path),
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, # expected err
+ 1, # check-props
+ 1) # dry-run
#Run the tests
@@ -3652,6 +3707,7 @@ test_list = [ None,
patch_set_prop_no_eol,
patch_add_symlink,
patch_moved_away,
+ patch_lacking_trailing_eol,
]
if __name__ == '__main__':
svn commit: r1158919 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: stsp
Date: Wed Aug 17 21:27:46 2011
New Revision: 1158919
URL: http://svn.apache.org/viewvc?rev=1158919&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(revert_restore_handle_copied_dirs): Replace the output parameter NEW_KIND
with a new boolean output parameter REMOVED_SELF. This ensures that the
node kind variable the caller is using remains correct in all cases, and
makes the code a bit easier to follow.
(revert_restore): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1158919&r1=1158918&r2=1158919&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Aug 17 21:27:46 2011
@@ -1310,16 +1310,17 @@ compare_revert_list_copied_children(cons
/* Remove all reverted copied children from the directory at LOCAL_ABSPATH.
- * If REMOVE_SELF is TRUE, also remove LOCAL_ABSPATH itself if possible
- * (REMOVE_SELF should be set if LOCAL_ABSPATH is itself a reverted copy).
+ * If REMOVE_SELF is TRUE, try to remove LOCAL_ABSPATH itself (REMOVE_SELF
+ * should be set if LOCAL_ABSPATH is itself a reverted copy).
+ *
+ * If REMOVED_SELF is not NULL, indicate in *REMOVED_SELF whether
+ * LOCAL_ABSPATH itself was removed.
*
* All reverted copied file children are removed from disk. Reverted copied
* directories left empty as a result are also removed from disk.
- *
- * If NEW_KIND is not NULL, return the resulting on-disk kind of the node
- * at LOCAL_ABSPATH in *NEW_KIND. */
+ */
static svn_error_t *
-revert_restore_handle_copied_dirs(svn_node_kind_t *new_kind,
+revert_restore_handle_copied_dirs(svn_boolean_t *removed_self,
svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t remove_self,
@@ -1334,8 +1335,8 @@ revert_restore_handle_copied_dirs(svn_no
apr_pool_t *iterpool;
svn_error_t *err;
- if (new_kind)
-*new_kind = svn_node_dir;
+ if (removed_self)
+*removed_self = FALSE;
SVN_ERR(svn_wc__db_revert_list_read_copied_children(&copied_children,
db, local_abspath,
@@ -1405,17 +1406,14 @@ revert_restore_handle_copied_dirs(svn_no
/* Delete LOCAL_ABSPATH itself if no children are left. */
err = svn_io_dir_remove_nonrecursive(local_abspath, iterpool);
if (err)
-{
- if (APR_STATUS_IS_ENOENT(err->apr_err) ||
- SVN__APR_STATUS_IS_ENOTDIR(err->apr_err) ||
- APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+ {
+ if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
svn_error_clear(err);
else
return svn_error_trace(err);
}
-
- if (new_kind)
-*new_kind = svn_node_none;
+ else if (removed_self)
+*removed_self = TRUE;
}
svn_pool_destroy(iterpool);
@@ -1536,10 +1534,16 @@ revert_restore(svn_wc__db_t *db,
on_disk = svn_node_none;
}
else if (reverted_kind == svn_wc__db_kind_dir && on_disk == svn_node_dir)
-SVN_ERR(revert_restore_handle_copied_dirs(&on_disk, db, local_abspath,
- TRUE,
- cancel_func, cancel_baton,
- scratch_pool));
+{
+ svn_boolean_t removed;
+
+ SVN_ERR(revert_restore_handle_copied_dirs(&removed, db,
+local_abspath, TRUE,
+cancel_func, cancel_baton,
+scratch_pool));
+ if (removed)
+on_disk = svn_node_none;
+}
}
/* If we expect a versioned item to be present then check that any
svn commit: r1158915 - /subversion/branches/fs-py/subversion/python/svn/fs/__init__.py
Author: hwright Date: Wed Aug 17 21:03:14 2011 New Revision: 1158915 URL: http://svn.apache.org/viewvc?rev=1158915&view=rev Log: On the fs-py branch: Add an empty section when reading the config to offset some test failures (and note why we're doing this). * subversion/python/svn/fs/__init__.py (FS._read_config): Add the rep-sharing section to the config object. Modified: subversion/branches/fs-py/subversion/python/svn/fs/__init__.py Modified: subversion/branches/fs-py/subversion/python/svn/fs/__init__.py URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/python/svn/fs/__init__.py?rev=1158915&r1=1158914&r2=1158915&view=diff == --- subversion/branches/fs-py/subversion/python/svn/fs/__init__.py (original) +++ subversion/branches/fs-py/subversion/python/svn/fs/__init__.py Wed Aug 17 21:03:14 2011 @@ -253,6 +253,11 @@ class FS(object): def _read_config(self): self._config = ConfigParser.RawConfigParser(_CONFIG_DEFAULTS) +### We add this section manually below to get the tests running (the +### tests clobber the default config file). There may be less-hacky +### ways of ensuring we don't error when attempting to read +### non-existent config values. +self._config.add_section(CONFIG_SECTION_REP_SHARING) self._config.read(self.__path_config) if format >= MIN_REP_SHARING_FORMAT:
svn commit: r1158912 - /subversion/branches/1.7.x/STATUS
Author: hwright Date: Wed Aug 17 20:59:27 2011 New Revision: 1158912 URL: http://svn.apache.org/viewvc?rev=1158912&view=rev Log: * STATUS: Goat, moat, throat, vote! Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158912&r1=1158911&r2=1158912&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 20:59:27 2011 @@ -139,7 +139,7 @@ Candidate changes: details). svn's blame receiver doesn't notice any problems as it just assumes that the interesting property values are valid cstrings. Votes: - +1: rhuijben + +1: rhuijben, hwright Veto-blocked changes: =
svn commit: r1158896 - /subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
Author: stsp
Date: Wed Aug 17 20:26:52 2011
New Revision: 1158896
URL: http://svn.apache.org/viewvc?rev=1158896&view=rev
Log:
Fix a failing ruby bindings test (fallout from r1158617 and related commits).
* subversion/bindings/swig/ruby/test/test_client.rb
(test_move_force): Don't manually remove a file after reverting a move.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb?rev=1158896&r1=1158895&r2=1158896&view=diff
==
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
(original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb Wed Aug
17 20:26:52 2011
@@ -1287,7 +1287,6 @@ class SvnClientTest < Test::Unit::TestCa
ctx.mv(path1, path2)
end
ctx.revert([path1, path2])
- FileUtils.rm(path2)
File.open(path1, "w") {|f| f.print(src2)}
assert_nothing_raised do
svn commit: r1158894 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 20:22:42 2011 New Revision: 1158894 URL: http://svn.apache.org/viewvc?rev=1158894&view=rev Log: * STATUS: Nominate r1158893 Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158894&r1=1158893&r2=1158894&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 20:22:42 2011 @@ -131,6 +131,16 @@ Candidate changes: Votes: +1: pburba + * r1158893 + Make sure that serf doesn't insert a final '\0' in a property value + retrieved via svn_ra_get_file_revs(). + Justification: + Unbreaks annotate in AnkhSVN when using serf. (See log message for + details). svn's blame receiver doesn't notice any problems as it just + assumes that the interesting property values are valid cstrings. + Votes: + +1: rhuijben + Veto-blocked changes: =
svn commit: r1158893 - /subversion/trunk/subversion/libsvn_ra_serf/blame.c
Author: rhuijben
Date: Wed Aug 17 20:18:20 2011
New Revision: 1158893
URL: http://svn.apache.org/viewvc?rev=1158893&view=rev
Log:
In serf's svn_ra_get_file_revs provide the real revision property values to
the callback instead of the property value + '\0'.
(The svn_string_t has it's own '\0' to make it a valid c string).
Found by using annotate in AnkhSVN. (SharpSvn notes that the property value
contains a '\0' before the end of the value and therefore assumes that the
string isn't utf-8)
* subversion/libsvn_ra_serf/blame.c
(create_propval): Don't include the '\0' in the real data of svn_string_t as
that isn't really part of the value.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/blame.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/blame.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blame.c?rev=1158893&r1=1158892&r2=1158893&view=diff
==
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Wed Aug 17 20:18:20 2011
@@ -159,8 +159,7 @@ create_propval(blame_info_t *info)
info->prop_attr_len + 1);
}
- /* Include the null term. */
- s = svn_string_ncreate(info->prop_attr, info->prop_attr_len + 1, info->pool);
+ s = svn_string_ncreate(info->prop_attr, info->prop_attr_len, info->pool);
if (info->prop_base64)
{
s = svn_base64_decode_string(s, info->pool);
svn commit: r1158886 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: stsp
Date: Wed Aug 17 19:58:48 2011
New Revision: 1158886
URL: http://svn.apache.org/viewvc?rev=1158886&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(revert_restore_handle_copied_dirs): Don't ignore all errors returned by
svn_io_dir_remove_nonrecursive(). Ignore only the ones we care about.
Use svn_io_dir_remove_nonrecursive() to remove LOCAL_ABSPATH itself. This
will check for remaining children so this function doesn't need to run
the check itself.
Suggested by: rhuijben
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1158886&r1=1158885&r2=1158886&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Aug 17 19:58:48 2011
@@ -1332,6 +1332,7 @@ revert_restore_handle_copied_dirs(svn_no
int i;
svn_node_kind_t on_disk;
apr_pool_t *iterpool;
+ svn_error_t *err;
if (new_kind)
*new_kind = svn_node_dir;
@@ -1365,9 +1366,7 @@ revert_restore_handle_copied_dirs(svn_no
SVN_ERR(svn_io_remove_file2(child_info->abspath, TRUE, iterpool));
}
- /* Try to delete every child directory, ignoring errors.
- * This is a bit crude but good enough for our purposes.
- *
+ /* Delete every empty child directory.
* We cannot delete children recursively since we want to keep any files
* that still exist on disk (e.g. unversioned files within the copied tree).
* So sort the children list such that longest paths come first and try to
@@ -1389,24 +1388,34 @@ revert_restore_handle_copied_dirs(svn_no
svn_pool_clear(iterpool);
- svn_error_clear(svn_io_dir_remove_nonrecursive(child_info->abspath,
- iterpool));
+ err = svn_io_dir_remove_nonrecursive(child_info->abspath, iterpool);
+ if (err)
+{
+ if (APR_STATUS_IS_ENOENT(err->apr_err) ||
+ SVN__APR_STATUS_IS_ENOTDIR(err->apr_err) ||
+ APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+svn_error_clear(err);
+ else
+return svn_error_trace(err);
+}
}
if (remove_self)
{
- apr_hash_t *remaining_children;
-
/* Delete LOCAL_ABSPATH itself if no children are left. */
- SVN_ERR(svn_io_get_dirents3(&remaining_children, local_abspath, TRUE,
- iterpool, iterpool));
- if (apr_hash_count(remaining_children) == 0)
+ err = svn_io_dir_remove_nonrecursive(local_abspath, iterpool);
+ if (err)
{
- SVN_ERR(svn_io_remove_dir2(local_abspath, FALSE, NULL, NULL,
- iterpool));
- if (new_kind)
-*new_kind = svn_node_none;
+ if (APR_STATUS_IS_ENOENT(err->apr_err) ||
+ SVN__APR_STATUS_IS_ENOTDIR(err->apr_err) ||
+ APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+svn_error_clear(err);
+ else
+return svn_error_trace(err);
}
+
+ if (new_kind)
+*new_kind = svn_node_none;
}
svn_pool_destroy(iterpool);
svn commit: r1158879 - in /subversion/branches/fs-py/subversion: libsvn_fs_py/fs_fs.c python/svn/fs/__init__.py
Author: hwright
Date: Wed Aug 17 19:27:28 2011
New Revision: 1158879
URL: http://svn.apache.org/viewvc?rev=1158879&view=rev
Log:
On the fs-py branch:
Move the remaining "open a FS" logic into Python.
* subversion/python/svn/fs/__init__.py
(_read_format): Moved here...
(FS._read_format): ...from here.
(_check_format): New.
(FS._open_fs): Finish opening the filesystem.
* subversion/libsvn_fs_py/fs_fs.c
(svn_fs_py__open): Just delegate to the Python method.
Modified:
subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c
subversion/branches/fs-py/subversion/python/svn/fs/__init__.py
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c?rev=1158879&r1=1158878&r2=1158879&view=diff
==
--- subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c Wed Aug 17
19:27:28 2011
@@ -1243,8 +1243,6 @@ svn_error_t *
svn_fs_py__open(svn_fs_t *fs, const char *path, apr_pool_t *pool)
{
fs_fs_data_t *ffd = fs->fsap_data;
- int format;
- int max_files_per_dir;
fs->path = apr_pstrdup(fs->pool, path);
@@ -1253,18 +1251,6 @@ svn_fs_py__open(svn_fs_t *fs, const char
apr_pool_cleanup_register(fs->pool, ffd->p_fs, svn_fs_py__destroy_py_object,
apr_pool_cleanup_null);
- /* Read the FS format number. */
- SVN_ERR(read_format(&format, &max_files_per_dir,
- path_format(fs, pool), pool));
- SVN_ERR(check_format(format));
-
- /* Read the min unpacked revision. */
- if (format >= SVN_FS_FS__MIN_PACKED_FORMAT)
-SVN_ERR(update_min_unpacked_rev(fs, pool));
-
- /* Read the configuration file. */
- SVN_ERR(read_config(fs, pool));
-
return SVN_NO_ERROR;
}
Modified: subversion/branches/fs-py/subversion/python/svn/fs/__init__.py
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/python/svn/fs/__init__.py?rev=1158879&r1=1158878&r2=1158879&view=diff
==
--- subversion/branches/fs-py/subversion/python/svn/fs/__init__.py (original)
+++ subversion/branches/fs-py/subversion/python/svn/fs/__init__.py Wed Aug 17
19:27:28 2011
@@ -54,6 +54,7 @@ MIN_PROTOREVS_DIR_FORMAT= 3
MIN_NO_GLOBAL_IDS_FORMAT= 3
MIN_PACKED_FORMAT = 4
MIN_REP_SHARING_FORMAT = 4
+PACKED_REVPROP_SQLITE_DEV_FORMAT= 5
_DEFAULT_MAX_FILES_PER_DIR = 1000
_TIMESTAMP_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
@@ -113,6 +114,25 @@ _DEFAULT_CONFIG_CONTENTS = \
CONFIG_OPTION_ENABLE_REP_SHARING)
+def _read_format(path):
+try:
+with open(path, 'rb') as f:
+format = int(f.readline())
+max_files_per_dir = 0
+for l in f:
+l = l.split()
+if format > MIN_LAYOUT_FORMAT_OPTION_FORMAT \
+and l[0] == 'layout':
+if l[1] == 'linear':
+max_files_per_dir = 0
+elif l[1] == 'sharded':
+max_files_per_dir = int(l[2])
+return (format, max_files_per_dir)
+except IOError:
+# Treat an absent format file as format 1.
+return (1, 0)
+
+
def _write_format(path, format, max_files_per_dir, overwrite=True):
assert 1 <= format and format <= FORMAT_NUMBER
@@ -138,6 +158,30 @@ def _write_format(path, format, max_file
os.chmod(path, stat.S_IREAD)
+def _check_format(format):
+'''Return the error svn.err.FS_UNSUPPORTED_FORMAT if FS's format
+number is not the same as a format number supported by this
+Subversion.'''
+
+# Blacklist. These formats may be either younger or older than
+# SVN_FS_FS__FORMAT_NUMBER, but we don't support them.
+if format is PACKED_REVPROP_SQLITE_DEV_FORMAT:
+raise svn.SubversionException(svn.err.FS_UNSUPPORTED_FORMAT,
+ "Found format '%d', only created by " +
+ "unreleased dev builds; see " +
+ "http://subversion.apache.org"; +
+ "/docs/release-notes/1.7#revprop-packing"
+ % format)
+
+# We support all formats from 1-current simultaneously
+if 1 <= format <= FORMAT_NUMBER:
+return
+
+raise svn.SubversionException(svn.err.FS_UNSUPPORTED_FORMAT,
+"Expected FS format between '1' and '%d'; found format '%d'" %
+(FORMAT_NUMBER, format))
+
+
class FS(object):
def __path_rev_shard(self, rev):
assert self.max_files_per_dir
@@ -249,25 +293,6 @@ class FS(object):
os.rename(tempf.name, final_path)
-def __read_format(self):
-try:
-with open(self
svn commit: r1158875 - in /subversion/trunk/subversion: libsvn_wc/adm_ops.c libsvn_wc/wc-queries.sql libsvn_wc/wc_db.c libsvn_wc/wc_db.h tests/cmdline/copy_tests.py tests/cmdline/revert_tests.py
Author: stsp
Date: Wed Aug 17 19:14:09 2011
New Revision: 1158875
URL: http://svn.apache.org/viewvc?rev=1158875&view=rev
Log:
Make 'svn revert' remove any kind of copied file, regardless of whether
the file was modified post-copy.
The rationale for this change can be found in a comment by Julian Foad
on issue #3601: http://subversion.tigris.org/issues/show_bug.cgi?id=3101#desc6
Quote:
svn revert should undo the local text and prop changes, undo the scheduling,
and also undo the copying of the file into its new location on disk,
since that is (like prop changes) an operation that Subversion performed
on the user's behalf as a "local modification" of the user's working copy.
Most parts of this change are concerned with removing the pristine checksum
comparison revert_restore_handle_copied_file() was doing. A fix for a bug
in revert_list_read() uncovered by a failing test is also included.
* subversion/tests/cmdline/copy_tests.py
(remove_conflict_file): No need to remove 'pi' after revert.
* subversion/tests/cmdline/revert_tests.py
(revert_tree_conflicts_in_updated_files): Expect 'A/D/G/rho' to be
delete from disk after revert. No need to delete it manually.
* subversion/libsvn_wc/adm_ops.c
(revert_restore_handle_copied_file): Remove. This was wrapping the
comparison to the pristine file, which is now unnecessary.
(revert_restore_handle_copied_dirs, revert_restore): Remove all reverted
copied files from disk. Update some comments.
* subversion/libsvn_wc/wc-queries.sql
(revert_list, trigger_revert_list_nodes, STMT_SELECT_REVERT_LIST,
STMT_SELECT_REVERT_LIST_COPIED_CHILDREN): Drop the pristine CHECKSUM.
It isn't needed anymore.
* subversion/libsvn_wc/wc_db.c
(revert_list_read_baton): Remove PRISTINE_CHECKSUM.
(revert_list_read): Remove handling of the pristine checksum.
Fix a bug: The COPIED_HERE output parameter wasn't set correctly if a
copied node also had an entry in the ACTUAL_NODES table. E.g. a copied
node which was also a tree-conflict victim was not recognised as a copy
by the revert code, and left behind unversioned on disk. Set COPIED_HERE
correctly in this case, too.
(svn_wc__db_revert_list_read): Remove PRISTINE_CHECKSUM output parameter.
(revert_list_read_copied_children): Remove handling of the pristine checksum.
Small indentation fixes.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_revert_list_read): Remove PRISTINE_CHECKSUM output parameter.
(svn_wc__db_revert_list_copied_child_info_t): Remove PRISTINE_CHECKSUM.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1158875&r1=1158874&r2=1158875&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Aug 17 19:14:09 2011
@@ -1292,48 +1292,6 @@ remove_conflict_file(svn_boolean_t *noti
}
-/* Remove the reverted copied file at LOCAL_ABSPATH from disk if it was
- * not modified after being copied. Use FILESIZE and PRISTINE_CHECKSUM to
- * detect modification.
- * If NEW_KIND is not NULL, return the resulting on-disk kind of the node
- * at LOCAL_ABSPATH in *NEW_KIND. */
-static svn_error_t *
-revert_restore_handle_copied_file(svn_node_kind_t *new_kind,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_filesize_t filesize,
- const svn_checksum_t *pristine_checksum,
- apr_pool_t *scratch_pool)
-{
- svn_stream_t *pristine_stream;
- svn_filesize_t pristine_size;
- svn_boolean_t has_text_mods;
-
- if (new_kind)
-*new_kind = svn_node_file;
-
- SVN_ERR(svn_wc__db_pristine_read(&pristine_stream, &pristine_size,
- db, local_abspath, pristine_checksum,
- scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__compare_file_with_pristine(&has_text_mods, db,
- local_abspath,
- filesize,
- pristine_stream,
- pristine_size,
- FALSE, FALSE, FALSE,
- scratch_pool));
-
- if (!has_text_mods)
-{
- SVN_ERR(svn_io_remove_file2(local_abspath, FALSE, scratch_pool));
- if (new_kind)
-*new_kind = svn_node_none;
svn commit: r1158860 [2/2] - in /subversion/branches/issue-3975: ./ subversion/bindings/ctypes-python/test/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/java
Modified: subversion/branches/issue-3975/subversion/svn/status.c
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/svn/status.c?rev=1158860&r1=1158859&r2=1158860&view=diff
==
--- subversion/branches/issue-3975/subversion/svn/status.c (original)
+++ subversion/branches/issue-3975/subversion/svn/status.c Wed Aug 17 18:25:07
2011
@@ -148,11 +148,22 @@ make_relpath(const char *relative_to_pat
/* An example:
* relative_to_path = /a/b/c
* target_path = /a/x/y/z
- * result = ../../x/y/z */
+ * result = ../../x/y/z
+ *
+ * Another example (Windows specific):
+ * relative_to_path = F:/wc
+ * target_path = C:/wc
+ * result = C:/wc
+ */
/* Skip the common ancestor of both paths, here '/a'. */
la = svn_dirent_get_longest_ancestor(relative_to_path, target_path,
scratch_pool);
+ if (*la == '\0')
+{
+ /* Nothing in common: E.g. C:/ vs F:/ on Windows */
+ return apr_pstrdup(result_pool, target_path);
+}
relative_to_path = svn_dirent_skip_ancestor(la, relative_to_path);
target_path = svn_dirent_skip_ancestor(la, target_path);
@@ -261,6 +272,10 @@ print_status(const char *path,
(*prop_conflicts)++;
}
+ /* Note that moved-from and moved-to information is only available in STATUS
+ * for (op-)roots of a move. Those are exactly the nodes we want to show
+ * move info for in 'svn status'. See also comments in svn_wc_status3_t. */
+
if (status->moved_from_abspath)
{
const char *cwd;
@@ -268,26 +283,23 @@ print_status(const char *path,
SVN_ERR(svn_dirent_get_absolute(&cwd, "", pool));
relpath = make_relpath(cwd, status->moved_from_abspath, pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
- moved_from_line = apr_psprintf(pool,
- "\n> moved from %s",
- relpath);
+ moved_from_line = apr_pstrcat(pool, "\n> ",
+apr_psprintf(pool, _("moved from %s"),
+ relpath),
+(char *)NULL);
}
- /* Only print an extra moved-to line for the op-root of a move-away.
- * As each and every child node of a deleted tree is printed in status
- * output, each of them would be "duplicated" with a moved-to line. */
- if (status->moved_to_abspath
- && status->moved_to_op_root_abspath
- && 0 == strcmp(status->moved_to_op_root_abspath,
- status->moved_to_abspath))
+ if (status->moved_to_abspath)
{
const char *cwd;
const char *relpath;
SVN_ERR(svn_dirent_get_absolute(&cwd, "", pool));
relpath = make_relpath(cwd, status->moved_to_abspath, pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
- moved_to_line = apr_psprintf(pool, "\n> moved to %s",
- relpath);
+ moved_to_line = apr_pstrcat(pool, "\n> ",
+ apr_psprintf(pool, _("moved to %s"),
+ relpath),
+ (char *)NULL);
}
if (detailed)
Modified: subversion/branches/issue-3975/subversion/svnversion/main.c
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/svnversion/main.c?rev=1158860&r1=1158859&r2=1158860&view=diff
==
--- subversion/branches/issue-3975/subversion/svnversion/main.c (original)
+++ subversion/branches/issue-3975/subversion/svnversion/main.c Wed Aug 17
18:25:07 2011
@@ -27,6 +27,8 @@
#include "svn_opt.h"
#include "svn_version.h"
+#include "private/svn_opt_private.h"
+
#include "svn_private_config.h"
#define SVNVERSION_OPT_VERSION SVN_OPT_FIRST_LONGOPT_ID
@@ -122,12 +124,10 @@ main(int argc, const char *argv[])
const char *local_abspath;
apr_allocator_t *allocator;
apr_pool_t *pool;
- int wc_format;
svn_wc_revision_status_t *res;
svn_boolean_t no_newline = FALSE, committed = FALSE;
svn_error_t *err;
apr_getopt_t *os;
- svn_node_kind_t kind;
svn_wc_context_t *wc_ctx;
svn_boolean_t quiet = FALSE;
svn_boolean_t is_version = FALSE;
@@ -224,86 +224,61 @@ main(int argc, const char *argv[])
return EXIT_FAILURE;
}
- SVN_INT_ERR(svn_utf_cstring_to_utf8
- (&wc_path, (os->ind < argc) ? os->argv[os->ind] : ".",
- pool));
- wc_path = svn_dirent_internal_style(wc_path, pool);
+ SVN_INT_ERR(svn_utf_cstring_to_utf8(&wc_path,
+ (os->ind < argc) ? os->argv[os->ind]
+ : ".",
+ pool));
+
+ SVN_INT_ERR(svn_opt__ar
svn commit: r1158859 - /subversion/branches/1.7.x/STATUS
Author: pburba Date: Wed Aug 17 18:24:28 2011 New Revision: 1158859 URL: http://svn.apache.org/viewvc?rev=1158859&view=rev Log: * STATUS: Nominate fix for issue #3989 (r1158407, r1158419, r1158854). Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158859&r1=1158858&r2=1158859&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 18:24:28 2011 @@ -121,6 +121,16 @@ Candidate changes: +1: rhuijben, danielsh +1 (r1158209, r1158210, r1158217): cmpilato + * r1158407, r1158419, r1158854 + Fix issue #3989 'merge which deletes file with native eol-style raises + spurious tree conflict'. + Justification: + Fixes a regression from 1.6.x in a common merge use case. + Notes: + r1158407 and r1158419 are the test, r1158854 is the fix. + Votes: + +1: pburba + Veto-blocked changes: =
svn commit: r1158854 - in /subversion/trunk/subversion: libsvn_client/cat.c libsvn_client/client.h libsvn_client/merge.c tests/cmdline/merge_tests.py
Author: pburba Date: Wed Aug 17 18:14:48 2011 New Revision: 1158854 URL: http://svn.apache.org/viewvc?rev=1158854&view=rev Log: Follow-up to r961254: Fix issue #3989 'merge which deletes file with native eol-style raises spurious tree conflict'. * subversion/libsvn_client/client.h (svn_client__get_normalized_stream): Add a new argument * subversion/libsvn_client/cat.c (svn_client__get_normalized_stream): Don't "normalize" eols to the value of the svn:eol-style property (if such is set). Rather, normalize eols to SVN_SUBST_NATIVE_EOL_STR if asked to do so and the svn:eol-property is set or leave the eols as is otherwise. (svn_client_cat2): Update call to svn_client__get_normalized_stream, keeping prior behavior, that eols not be normalized. * subversion/libsvn_client/merge.c (files_same_p): Update call to svn_client__get_normalized_stream, asking that eols be normalized. * subversion/tests/cmdline/merge_tests.py (merged_deletion_causes_tree_conflict): Remove XFail decorator and comment. Modified: subversion/trunk/subversion/libsvn_client/cat.c subversion/trunk/subversion/libsvn_client/client.h subversion/trunk/subversion/libsvn_client/merge.c subversion/trunk/subversion/tests/cmdline/merge_tests.py Modified: subversion/trunk/subversion/libsvn_client/cat.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cat.c?rev=1158854&r1=1158853&r2=1158854&view=diff == --- subversion/trunk/subversion/libsvn_client/cat.c (original) +++ subversion/trunk/subversion/libsvn_client/cat.c Wed Aug 17 18:14:48 2011 @@ -50,6 +50,7 @@ svn_client__get_normalized_stream(svn_st const char *local_abspath, const svn_opt_revision_t *revision, svn_boolean_t expand_keywords, + svn_boolean_t normalize_eols, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, @@ -163,8 +164,10 @@ svn_client__get_normalized_stream(svn_st /* Wrap the output stream if translation is needed. */ if (eol != NULL || kw != NULL) -input = svn_subst_stream_translated(input, eol, FALSE, kw, expand_keywords, -result_pool); +input = svn_subst_stream_translated( + input, + (eol_style && normalize_eols) ? SVN_SUBST_NATIVE_EOL_STR : eol, + FALSE, kw, expand_keywords, result_pool); *normal_stream = input; @@ -211,7 +214,7 @@ svn_client_cat2(svn_stream_t *out, SVN_ERR(svn_dirent_get_absolute(&local_abspath, path_or_url, pool)); SVN_ERR(svn_client__get_normalized_stream(&normal_stream, ctx->wc_ctx, -local_abspath, revision, TRUE, +local_abspath, revision, TRUE, FALSE, ctx->cancel_func, ctx->cancel_baton, pool, pool)); Modified: subversion/trunk/subversion/libsvn_client/client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1158854&r1=1158853&r2=1158854&view=diff == --- subversion/trunk/subversion/libsvn_client/client.h (original) +++ subversion/trunk/subversion/libsvn_client/client.h Wed Aug 17 18:14:48 2011 @@ -1051,13 +1051,21 @@ svn_client__ensure_revprop_table(apr_has /* Return a potentially translated version of local file LOCAL_ABSPATH in NORMAL_STREAM. REVISION must be one of the following: BASE, COMMITTED, - WORKING. Uses SCRATCH_POOL for temporary allocations. */ + WORKING. + + EXPAND_KEYWORDS operates as per the EXPAND argument to + svn_subst_stream_translated, which see. If NORMALIZE_EOLS is TRUE and + LOCAL_ABSPATH requires translation, then normalize the line endings in + *NORMAL_STREAM. + + Uses SCRATCH_POOL for temporary allocations. */ svn_error_t * svn_client__get_normalized_stream(svn_stream_t **normal_stream, svn_wc_context_t *wc_ctx, const char *local_abspath, const svn_opt_revision_t *revision, svn_boolean_t expand_keywords, + svn_boolean_t normalize_eols, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, Modified: subversion/trunk/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1158854&r1=1158853&r2=1158854&view=diff ===
svn commit: r1158735 - /subversion/branches/1.7.x/STATUS
Author: danielsh Date: Wed Aug 17 14:27:45 2011 New Revision: 1158735 URL: http://svn.apache.org/viewvc?rev=1158735&view=rev Log: Tweak votes in an existing section. I think r1158727 unintentionally reversed the semantics here. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158735&r1=1158734&r2=1158735&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:27:45 2011 @@ -118,8 +118,8 @@ Candidate changes: Notes: r1158196, r1158201, r1158207 adds (and tweaks) the test for tis problem. Votes: - +1: rhuijben - +1: danielsh, cmpilato (Without r1158209, r1158210, r1158217) + +1: rhuijben, danielsh + +1 (r1158209, r1158210, r1158217): cmpilato Veto-blocked changes: =
svn commit: r1158734 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 14:24:38 2011 New Revision: 1158734 URL: http://svn.apache.org/viewvc?rev=1158734&view=rev Log: * STATUS: Remove the r1148043 group Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158734&r1=1158733&r2=1158734&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:24:38 2011 @@ -61,14 +61,6 @@ Candidate changes: Votes: +1: arfrever, philip - * r1148043, r1151055 - Allow building with serf trunk on windows. - Votes: - +0: danielsh (r1151055 only) - +1: pburba - -0: gstein, rhuijben (the serf 2.x API will be incompatible with 1.7.x, so - this will never be useful) - * r1154278, r1154379, r1154382 Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using ra_serf.
svn commit: r1158727 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 14:15:46 2011 New Revision: 1158727 URL: http://svn.apache.org/viewvc?rev=1158727&view=rev Log: * STATUS: Add backport branch for r1155160. Change some votes Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158727&r1=1158726&r2=1158727&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:15:46 2011 @@ -61,28 +61,13 @@ Candidate changes: Votes: +1: arfrever, philip - * r1148992 - Print error messages about failures of dynamic loading of libraries when - SVN_DEBUG_DSO is defined instead of never. - Justification: - Suboptimal r1148374 was already backported in r1148488. - Votes: - +1: arfrever - -0: rhuijben (A library shouldn't just write things to stderr. This needs - proper error handling instead. And besides I doubt anyone is - going to use this define (No veto!)) - -0: philip (changed my mind, I don't think this is needed on the branch) - -0: stsp (Arfrever, can you please explain precisely what use case you - have for this code? Why do you need it in the release, or - on trunk, for that matter?) - * r1148043, r1151055 Allow building with serf trunk on windows. Votes: +0: danielsh (r1151055 only) - +1: pburba, rhuijben - -0: gstein (the serf 2.x API will be incompatible with 1.7.x, so this - will never be useful) + +1: pburba + -0: gstein, rhuijben (the serf 2.x API will be incompatible with 1.7.x, so + this will never be useful) * r1154278, r1154379, r1154382 Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using @@ -134,18 +119,35 @@ Candidate changes: Votes: +1: rhuijben, cmpilato + * r1158196, r1158201, r1158207, r1158209, r1158210, r1158217 + Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'. + Justification: + That syntax should work. + Notes: + r1158196, r1158201, r1158207 adds (and tweaks) the test for tis problem. + Votes: + +1: rhuijben + +1: danielsh, cmpilato (Without r1158209, r1158210, r1158217) + Veto-blocked changes: = + * r1148992 + Print error messages about failures of dynamic loading of libraries when + SVN_DEBUG_DSO is defined instead of never. + Justification: + Suboptimal r1148374 was already backported in r1148488. + Votes: + +1: arfrever + -1: rhuijben (A library shouldn't just write things to stderr. This needs + proper error handling instead. And besides I doubt anyone is + going to use this define (Soft veto. Feel free to -0 when the + problems are resolved)) + -0: philip (changed my mind, I don't think this is needed on the branch) + -0: stsp (Arfrever, can you please explain precisely what use case you + have for this code? Why do you need it in the release, or + on trunk, for that matter?) + Approved changes: = - - * r1158209, r1158210, r1158217 - Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'. - Justification: - That syntax should work. - Notes: - Merge conflicts in the test suite. - Votes: - +1: danielsh, rhuijben, cmpilato
svn commit: r1158726 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 14:10:30 2011 New Revision: 1158726 URL: http://svn.apache.org/viewvc?rev=1158726&view=rev Log: * STATUS: The 1.7.x-r1155160 branch looks good to me, update my vote. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158726&r1=1158725&r2=1158726&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:10:30 2011 @@ -111,9 +111,9 @@ Candidate changes: Branch: ^/subversion/branches/1.7.x-r1155160 Votes: - +1: rhuijben - +0: stsp, cmpilato (Without branch: Change looks good, but there is a - merge conflict. Please create a backport branch.) + +1: rhuijben, stsp + +1: cmpilato (Without branch: Change looks good, but there is a + merge conflict. Please create a backport branch.) * r1158187, r1158196, r1158201, r1158207 Fix issues #2557 and #3987: 'svn info symlink/to/wc'.
svn commit: r1158724 [1/2] - in /subversion/branches/1.7.x: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/
Author: hwright Date: Wed Aug 17 14:08:13 2011 New Revision: 1158724 URL: http://svn.apache.org/viewvc?rev=1158724&view=rev Log: Reintegrate the 1.7.x-JavaHL-pools branche: * r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 Cleanup JavaHL pool handling. This to improve thread safety, concurrency and memory usage. Justification: This patch makes JavaHL behave better inside the JVM. Branch: ^/subversion/branches/1.7.x-JavaHL-pools Votes: +1: rhuijben, markphip Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.h subversion/branches/1.7.x/subversion/bindings/javahl/native/CopySources.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/CopySources.h subversion/branches/1.7.x/subversion/bindings/javahl/native/File.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/InputStream.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIThreadData.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIThreadData.h subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/JNIUtil.h subversion/branches/1.7.x/subversion/bindings/javahl/native/OutputStream.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Path.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Path.h subversion/branches/1.7.x/subversion/bindings/javahl/native/Pool.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Pool.h subversion/branches/1.7.x/subversion/bindings/javahl/native/Prompter.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Prompter.h subversion/branches/1.7.x/subversion/bindings/javahl/native/RevisionRange.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/RevpropTable.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNBase.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNBase.h subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNRepos.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/StringArray.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Targets.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/Targets.h subversion/branches/1.7.x/subversion/bindings/javahl/native/libsvnjavahl.la.c subversion/branches/1.7.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 14:08:13 2011 @@ -1,4 +1,5 @@ /subversion/branches/1.5.x-r30215:870312 +/subversion/branches/1.7.x-JavaHL-pools:1158684-1158722 /subversion/branches/1.7.x-issue3888:1148937-1149162 /subversion/branches/1.7.x-neon-default:1148803-1158680 /subversion/branches/1.7.x-r1152189:1152759-1154249 @@ -56,4 +57,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455,1158634 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,115
svn commit: r1158722 - in /subversion/branches/1.7.x: ./ STATUS subversion/svn/main.c
Author: hwright
Date: Wed Aug 17 14:06:12 2011
New Revision: 1158722
URL: http://svn.apache.org/viewvc?rev=1158722&view=rev
Log:
Merge r1158634 from trunk:
* r1158634
Fix error in help text of 'svn revert'.
Justification:
Help texts should document the current behaviour, not past behaviour.
Votes:
+1: stsp, rhuijben, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svn/main.c
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 14:06:12 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455,1158634
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158722&r1=1158721&r2=1158722&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:06:12 2011
@@ -150,13 +150,6 @@ Approved changes:
Votes:
+1: danielsh, rhuijben, cmpilato
- * r1158634
- Fix error in help text of 'svn revert'.
- Justification:
- Help texts should document the current behaviour, not past behaviour.
- Votes:
- +1: stsp, rhuijben, cmpilato
-
* r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225
Cleanup JavaHL pool handling. This to improve thread safety, concurrency and
memory usage.
Modified: subversion/branches/1.7.x/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/main.c?rev=1158722&r1=1158721&r2=1158722&view=diff
==
--- subversion/branches/1.7.x/subversion/svn/main.c (original)
+++ subversion/branches/1.7.x/subversion/svn/main.c Wed Aug 17 14:06:12 2011
@@ -1184,7 +1184,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"usage: revert PATH...\n"
"\n"
" Note: this subcommand does not require network access, and resolves\n"
- " any conflicted states. However, it does not restore removed
directories.\n"),
+ " any conflicted states.\n"),
{opt_targets, 'R', opt_depth, 'q', opt_changelist} },
{ "status", svn_cl__status, {"stat", "st"}, N_
svn commit: r1158721 - /subversion/branches/1.7.x/STATUS
Author: hwright Date: Wed Aug 17 14:05:44 2011 New Revision: 1158721 URL: http://svn.apache.org/viewvc?rev=1158721&view=rev Log: * STATUS: Note a merge conflict. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158721&r1=1158720&r2=1158721&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:05:44 2011 @@ -145,6 +145,8 @@ Approved changes: Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'. Justification: That syntax should work. + Notes: + Merge conflicts in the test suite. Votes: +1: danielsh, rhuijben, cmpilato
svn commit: r1158717 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/commit.c subversion/tests/cmdline/import_tests.py
Author: hwright
Date: Wed Aug 17 14:01:10 2011
New Revision: 1158717
URL: http://svn.apache.org/viewvc?rev=1158717&view=rev
Log:
Merge r1155391, r1155404, r1156218 from trunk:
* r1155391, r1155404, r1156218
Fix issue 3983, import into foreign repository.
Justification:
It's a regression from 1.6.
Votes:
+1: philip, rhuijben, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/commit.c
subversion/branches/1.7.x/subversion/tests/cmdline/import_tests.py
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 14:01:10 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158717&r1=1158716&r2=1158717&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:01:10 2011
@@ -141,13 +141,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1155391, r1155404, r1156218
- Fix issue 3983, import into foreign repository.
- Justification:
- It's a regression from 1.6.
- Votes:
- +1: philip, rhuijben, cmpilato
-
* r1158209, r1158210, r1158217
Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/commit.c?rev=1158717&r1=1158716&r2=1158717&view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/commit.c Wed Aug 17
14:01:10 2011
@@ -696,7 +696,6 @@ svn_client_import4(const char *path,
apr_hash_t *excludes = apr_hash_make(pool);
svn_node_kind_t kind;
const char *local_abspath;
- const char *base_dir_abspath;
apr_array_header_t *new_entries = apr_array_make(pool, 4,
sizeof(const char *));
const char *temp;
@@ -708,7 +707,6 @@ svn_client_import4(const char *path,
_("'%s' is not a local path"), path);
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- base_dir_abspath = local_abspath;
/* Create a new commit item and add it to the array. */
if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
@@ -739,8 +737,6 @@ svn_client_import4(const char *path,
}
SVN_ERR(svn_io_check_path(local_abspath, &kind, pool));
- if (kind == svn_node_file)
-base_dir_abspath = svn_dirent_dirname(local_abspath, pool);
/* Figure out all the path components we need to create just to have
a pl
svn commit: r1158715 - /subversion/branches/1.7.x/STATUS
Author: markphip Date: Wed Aug 17 13:59:54 2011 New Revision: 1158715 URL: http://svn.apache.org/viewvc?rev=1158715&view=rev Log: * STATUS: Vote and approve 1.7.x-JavaHL-pools branch Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158715&r1=1158714&r2=1158715&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:59:54 2011 @@ -134,15 +134,6 @@ Candidate changes: Votes: +1: rhuijben, cmpilato - * r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 - Cleanup JavaHL pool handling. This to improve thread safety, concurrency and - memory usage. - Justification: - This patch makes JavaHL behave better inside the JVM. - Branch: ^/subversion/branches/1.7.x-JavaHL-pools - Votes: - +1: rhuijben - Veto-blocked changes: = @@ -170,3 +161,14 @@ Approved changes: Help texts should document the current behaviour, not past behaviour. Votes: +1: stsp, rhuijben, cmpilato + +* r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 + Cleanup JavaHL pool handling. This to improve thread safety, concurrency and + memory usage. + Justification: +This patch makes JavaHL behave better inside the JVM. + Branch: ^/subversion/branches/1.7.x-JavaHL-pools + Votes: ++1: rhuijben, markphip + +
svn commit: r1158713 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 13:59:26 2011 New Revision: 1158713 URL: http://svn.apache.org/viewvc?rev=1158713&view=rev Log: * STATUS: Add backport branch for r1155160 Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158713&r1=1158712&r2=1158713&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:59:26 2011 @@ -108,10 +108,12 @@ Candidate changes: Without this patch it is not possible to reliable checkout neon using serf. (svn co http://svn.webdav.org/repos/projects/neon/tags/0.29.6 wc). I (rhuijben) call that a regression. + Branch: + ^/subversion/branches/1.7.x-r1155160 Votes: +1: rhuijben - +0: stsp, cmpilato (Change looks good, but there is a merge conflict. - Please create a backport branch.) + +0: stsp, cmpilato (Without branch: Change looks good, but there is a + merge conflict. Please create a backport branch.) * r1158187, r1158196, r1158201, r1158207 Fix issues #2557 and #3987: 'svn info symlink/to/wc'.
svn commit: r1158712 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/util.c
Author: hwright
Date: Wed Aug 17 13:58:17 2011
New Revision: 1158712
URL: http://svn.apache.org/viewvc?rev=1158712&view=rev
Log:
Merge r1155131 from trunk, resolving conflicts as appropriate:
* r1155131
Cleanup the xml parser in serf in unexpected conditions.
Justification:
Without this patch the xml parser is only freed when http responses are
read successfully.
Notes:
This patch requires r1148932 to be backported for a clean merge.
Currently accept theirs on conflict produces the right result.
Votes:
+1: rhuijben, stsp, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:58:17 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158712&r1=1158711&r2=1158712&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:58:17 2011
@@ -148,17 +148,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1155131
- Cleanup the xml parser in serf in unexpected conditions.
- Justification:
- Without this patch the xml parser is only freed when http responses are
- read successfully.
- Notes:
- This patch requires r1148932 to be backported for a clean merge.
- Currently accept theirs on conflict produces the right result.
- Votes:
- +1: rhuijben, stsp, cmpilato
-
* r1155391, r1155404, r1156218
Fix issue 3983, import into foreign repository.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c?rev=1158712&r1=1158711&r2=1158712&view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c Wed Aug 17
13:58:17 2011
@@ -1373,6 +1373,21 @@ inject_to_parser(svn_ra_serf__xml_parser
return SVN_NO_ERROR;
}
+/* Apr pool cleanup handler to release an XML_Parser in success and error
+ conditions */
+static apr_status_t
+xml_parser_cleanup(void *baton)
+{
+ XML_Parser *xmlp = baton;
+
+ if (*xmlp)
+{
+ XML_ParserFree(*xmlp);
+ *xmlp = NULL;
+}
+
+ return APR_SUCCESS;
+}
svn_error_t *
svn_ra_serf__process_pending(svn_ra_serf__xml_parser_t *parser,
@@ -1477,7 +1492,7 @@ svn_ra_serf__process_pending(svn_ra_serf
return status. We just don't care. */
(void) XML_Parse(parser->xmlp, NULL, 0, 1);
- XML_ParserFree(parser->xmlp);
+ apr_pool_cleanup_run(p
svn commit: r1158710 - in /subversion/branches/1.7.x-r1155160: ./ subversion/libsvn_ra_serf/ra_serf.h subversion/libsvn_ra_serf/util.c
Author: rhuijben
Date: Wed Aug 17 13:56:51 2011
New Revision: 1158710
URL: http://svn.apache.org/viewvc?rev=1158710&view=rev
Log:
On the 1.7.x-r1155160 branch: Merge r1155160 from trunk, resolving conflict.
Modified:
subversion/branches/1.7.x-r1155160/ (props changed)
subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c
Propchange: subversion/branches/1.7.x-r1155160/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:56:51 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155160,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h?rev=1158710&r1=1158709&r2=1158710&view=diff
==
--- subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h
(original)
+++ subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h Wed
Aug 17 13:56:51 2011
@@ -622,6 +622,11 @@ struct svn_ra_serf__xml_parser_t {
See libsvn_ra_serf/util.c */
struct svn_ra_serf__pending_t *pending;
+
+ /* Response restart support */
+ const void *headers_baton; /* Last pointer to headers */
+ apr_off_t skip_size; /* Number of bytes to skip */
+ apr_off_t read_size; /* Number of bytes read from response */
};
/*
Modified: subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c?rev=1158710&r1=1158709&r2=1158710&view=diff
==
--- subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c
(original)
+++ subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c Wed Aug
17 13:56:51 2011
@@ -1528,6 +1528,22 @@ svn_ra_serf__handle_xml_parser(serf_requ
return SVN_NO_ERROR;
}
+ if (ctx->headers_baton == NULL)
+ctx->headers_baton = serf_bucket_response_get_headers(response);
+ else if (ctx->headers_baton != serf_bucket_response_get_headers(response))
+{
+ /* We got a new response to an existing parser...
+ This tells us the connection has restarted and we should continue
+ where we stopped last time.
+ */
+
+ /* Is this a second attempt?? */
+ if (!ctx->skip_size)
+ctx->skip_size = ctx->read_size;
+
+ ctx->read_size = 0; /* New request, nothing read */
+}
+
if (!ctx->xmlp)
{
ctx->xmlp = XML_ParserCreate(NULL);
@@ -1563,6 +1579,35 @@ svn_ra_serf__handle_xml_parser(serf_requ
return svn_error_wrap_apr(status, NULL);
}
+ ctx->read_size += len;
+
+ if (ctx->skip_size)
+{
+ /* Handle restarted requests correctly: Skip what we already read */
+ apr_size_t skip;
+
+ if (ctx->skip_size >= ctx->read_size)
+{
+
svn commit: r1158709 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/locks.c subversion/libsvn_ra_serf/merge.c subversion/libsvn_ra_serf/serf.c subversion/libsvn_ra_serf/util.c su
Author: hwright Date: Wed Aug 17 13:55:22 2011 New Revision: 1158709 URL: http://svn.apache.org/viewvc?rev=1158709&view=rev Log: Merge r1154982, r1155124 from trunk: * r1154982, r1155124 Stop returning APR_EGENERAL from serf for unexpected data. Justification: Clients like AnkhSVN can't see what kind of error this is so they can only show a dialog with an error which in some cases is even not clear to normal users. Notes: r1154982 improves the generic errors and r1155124 restores some specific 'svn lock' behavior that was broken by r1154982. Votes: +1: rhuijben, stsp, cmpilato Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c subversion/branches/1.7.x/subversion/libsvn_ra_serf/serf.c subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c subversion/branches/1.7.x/subversion/tests/cmdline/lock_tests.py Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 13:55:22 2011 @@ -56,4 +56,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158709&r1=1158708&r2=1158709&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:55:22 2011 @@ -148,18 +148,6 @@ Veto-blocked changes: Approved changes: = - * r1154982, r1155124 - Stop returning APR_EGENERAL from serf for unexpected data. - Justification: - Clients like AnkhSVN can't see what kind of error this is so they can - only show a dialog with an error which in some cases is even not clear - to normal users. - Notes: - r1154982 improves the generic errors and r1155124 restores some - specific 'svn lock' behavior that was broken by r1154982. - Votes: - +1: rhuijben, stsp, cmpilato - * r1155131 Cleanup the xml parser in serf in unexpected conditions. Justification: Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c?rev=1158709&r1=1158708&r2=1158709&view=diff == --- subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c Wed Aug 17 13:55:22 2011 @@ -385,14 +385,6 @@ handle_lock(serf_request_t *request, return err; } - /* 405 == Method Not Allowed (Occurs when trying to lock a working - copy path which no longer exists at HEAD in the repository. */ - if (sl.code == 405) -return svn_error_createf(SVN_ERR_FS_OUT_OF_DATE, -
svn commit: r1158707 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_serf/update.c
Author: hwright
Date: Wed Aug 17 13:53:27 2011
New Revision: 1158707
URL: http://svn.apache.org/viewvc?rev=1158707&view=rev
Log:
Merge r1154733 from trunk:
* r1154733
Correctly position buffer pointer when resuming an aborted transfer in serf.
Justification:
Invalid pointer operation that causes at least datastream corruption.
Votes:
+1: rhuijben, stsp, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:53:27 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154733,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158707&r1=1158706&r2=1158707&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:53:27 2011
@@ -148,13 +148,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1154733
- Correctly position buffer pointer when resuming an aborted transfer in serf.
- Justification:
- Invalid pointer operation that causes at least datastream corruption.
- Votes:
- +1: rhuijben, stsp, cmpilato
-
* r1154982, r1155124
Stop returning APR_EGENERAL from serf for unexpected data.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c?rev=1158707&r1=1158706&r2=1158707&view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c Wed Aug 17
13:53:27 2011
@@ -918,6 +918,7 @@ handle_fetch(serf_request_t *request,
if (fetch_ctx->aborted_read)
{
+ apr_off_t skip;
/* We haven't caught up to where we were before. */
if (fetch_ctx->read_size < fetch_ctx->aborted_read_size)
{
@@ -938,9 +939,10 @@ handle_fetch(serf_request_t *request,
/* Woo-hoo. We're back. */
fetch_ctx->aborted_read = FALSE;
- /* Increment data and len by the difference. */
- data += fetch_ctx->read_size - fetch_ctx->aborted_read_size;
- len = fetch_ctx->read_size - fetch_ctx->aborted_read_size;
+ /* Update data and len to just provide the new data. */
+ skip = len - (fetch_ctx->read_size - fetch_ctx->aborted_read_size);
+ data += skip;
+ len -= skip;
}
if (fetch_ctx->delta_stream)
svn commit: r1158705 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_neon/fetch.c subversion/libsvn_ra_serf/update.c
Author: hwright Date: Wed Aug 17 13:52:17 2011 New Revision: 1158705 URL: http://svn.apache.org/viewvc?rev=1158705&view=rev Log: Merge r1154717, r1154718 from trunk: * r1154717, r1154718 Detect broken svndiff streams in serf (r1154717) and neon (r1154718), in non-bulk updates before we even do the md5 checksum in the update editor. Justification: Some sanity checking doesn't hurt. Improves error details and avoids storing invalid streams in the pristine store. Votes: +1: rhuijben, stsp, cmpilato Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 13:52:17 2011 @@ -56,4 +56,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158705&r1=1158704&r2=1158705&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:52:17 2011 @@ -148,15 +148,6 @@ Veto-blocked changes: Approved changes: = - * r1154717, r1154718 - Detect broken svndiff streams in serf (r1154717) and neon (r1154718), in - non-bulk updates before we even do the md5 checksum in the update editor. - Justification: - Some sanity checking doesn't hurt. Improves error details and avoids - storing invalid streams in the pristine store. - Votes: - +1: rhuijben, stsp, cmpilato - * r1154733 Correctly position buffer pointer when resuming an aborted transfer in serf. Justification: Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c?rev=1158705&r1=1158704&r2=1158705&view=diff == --- subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c Wed Aug 17 13:52:17 2011 @@ -528,7 +528,10 @@ static svn_error_t *simple_fetch_file(sv TRUE, pool)); /* close the handler, since the file reading completed successfully. */ - return (*frc.handler)(NULL, frc.handler_baton); + if (frc.stream) +return svn_stream_close(frc.stream); + else +return (*frc.handler)(NULL, frc.handler_baton); } /* Helper for svn_ra_neon__get_file. This implements Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c?rev=1158705&r1=1158704&r2=1158705&view=diff == --- subversion/branches/1.7.x/subversion/libsvn_
svn commit: r1158704 - /subversion/branches/1.7.x-r1155160/
Author: rhuijben Date: Wed Aug 17 13:51:08 2011 New Revision: 1158704 URL: http://svn.apache.org/viewvc?rev=1158704&view=rev Log: Create 1.7.x-r1155160 branch Added: subversion/branches/1.7.x-r1155160/ (props changed) - copied from r1158703, subversion/branches/1.7.x/ Propchange: subversion/branches/1.7.x-r1155160/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 17 13:51:08 2011 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/branches/1.7.x-r1155160/ -- bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/branches/1.7.x-r1155160/ -- --- svn:ignore (added) +++ svn:ignore Wed Aug 17 13:51:08 2011 @@ -0,0 +1,50 @@ +ChangeLog* +Makefile +config.cache +config.log +config.nice +config.status +configure +libtool +.gdb_history +.swig_checked +*.orig +*.rej +TAGS +tags +neon +build-outputs.mk +autogen-standalone.mk +autom4te.cache +gen-make.opts +tests.log* +fails.log +db4-win32 +db +*.o +*~ +.*~ +apr +apr-util +apr-iconv +Release +Debug +ipch +subversion_msvc.dsw +subversion_msvc.ncb +subversion_msvc.opt +subversion_msvc.plg +subversion_vcnet.sln +subversion_vcnet.ncb +subversion_vcnet.suo +subversion_vcnet.sdf +subversion_vcnet.opensdf +mkmf.log +.project +.classpath +.cdtproject +.settings +.cproject +zlib +sqlite-amalgamation +serf Propchange: subversion/branches/1.7.x-r1155160/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 17 13:51:08 2011 @@ -0,0 +1,59 @@ +/subversion/branches/1.5.x-r30215:870312 +/subversion/branches/1.7.x-issue3888:1148937-1149162 +/subversion/branches/1.7.x-neon-default:1148803-1158680 +/subversion/branches/1.7.x-r1152189:1152759-1154249 +/subversion/branches/atomic-revprop:965046-1000689 +/subversion/branches/bdb-reverse-deltas:872050-872529 +/subversion/branches/diff-callbacks3:870059-870761 +/subversion/branches/diff-optimizations:1031270-1037352 +/subversion/branches/diff-optimizations-bytes:1037353-1067789 +/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118 +/subversion/branches/double-delete:870511-872970 +/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997 +/subversion/branches/file-externals:871779-873302 +/subversion/branches/fs-rep-sharing:869036-873803 +/subversion/branches/fsfs-pack:873717-874575 +/subversion/branches/gnome-keyring:870558-871410 +/subversion/branches/http-protocol-v2:874395-876041 +/subversion/branches/in-memory-cache:869829-871452 +/subversion/branches/integrate-cache-item-serialization:1068724-1068739 +/subversion/branches/integrate-cache-membuffer:998649-998852 +/subversion/branches/integrate-compression-level:1068651-1072287 +/subversion/branches/integrate-io-improvements:1068684-1072297 +/subversion/branches/integrate-is-cachable:1072568-1074082 +/subversion/branches/integrate-partial-getter:1072558-1076552 +/subversion/branches/integrate-readline-speedup:1072553-1072555 +/subversion/branches/integrate-stream-api-extensions:1068695-1072516 +/subversion/branches/integrate-txdelta-caching:1072541-1078213 +/subversion/branches/issue-2779-dev:965496-984198 +/subversion/branches/issue-2843-dev:871432-874179 +/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734 +/subversion/branches/issue-3067-deleted-subtrees:873375-874084 +/subversion/branches/issue-3148-dev:875193-875204 +/subversion/branches/issue-3220-dev:872210-872226 +/subversion/branches/issue-3242-dev:879653-896436 +/subversion/branches/issue-3334-dirs:875156-875867 +/subversion/branches/issue-3668-3669:1031000-1035744 +/subversion/branches/kwallet:870785-871314 +/subversion/branches/log-g-performance:870941-871032 +/subversion/branches/merge-skips-obstructions:874525-874615 +/subversion/branches/nfc-nfd-aware-client:870276,870376 +/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,9928
svn commit: r1158703 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/swig/ruby/test/util.rb
Author: hwright
Date: Wed Aug 17 13:50:49 2011
New Revision: 1158703
URL: http://svn.apache.org/viewvc?rev=1158703&view=rev
Log:
Merge r1154908 from trunk:
* r1154908
Fix spurious test failures in Ruby bindings.
Justification:
Spurious test failures are a huge distraction and time sink when
signing releases.
Votes:
+1: stsp
+1: rhuijben (safe change. Doesn't break code and probably fixes tests)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:50:49 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158703&r1=1158702&r2=1158703&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:50:49 2011
@@ -207,12 +207,3 @@ Approved changes:
Help texts should document the current behaviour, not past behaviour.
Votes:
+1: stsp, rhuijben, cmpilato
-
- * r1154908
- Fix spurious test failures in Ruby bindings.
- Justification:
- Spurious test failures are a huge distraction and time sink when
- signing releases.
- Votes:
- +1: stsp
- +1: rhuijben (safe change. Doesn't break code and probably fixes tests)
\ No newline at end of file
Modified: subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb?rev=1158703&r1=1158702&r2=1158703&view=diff
==
--- subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
(original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb Wed
Aug 17 13:50:49 2011
@@ -262,7 +262,7 @@ realm = #{@realm}
"svn://#{@svnserve_host}:#{@svnserve_port}#{@full_repos_path}"
# Avoid a race by waiting a short time for svnserve to start up.
# Without this, tests can fail with "Connection refused" errors.
- sleep 0.1
+ sleep 1
break
end
end
svn propchange: r1158680 - svn:log
Author: hwright Revision: 1158680 Modified property: svn:log Modified: svn:log at Wed Aug 17 13:49:04 2011 -- --- svn:log (original) +++ svn:log Wed Aug 17 13:49:04 2011 @@ -1,13 +1,10 @@ Merge r1158421, r1158436, r1158455 from trunk, resolving conflicts as noted: - - * r1154165 - Make the cmdline argument parser ignore upgrade required errors to - allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an - error. + + * r1158421, r1158436, r1158455 + JavaHL: Fix implementation of propertySetRemote method. Justification: - Usually svn allows case differences, but in this case it doesn't. - (Triggerable in other scenarios) - http://svn.haxx.se/users/archive-2011-08/0142.shtml + The new method is not usable without these changes. + NOTE: This has trivial merge conflicts that need to be resolved due + to the JavaHL pool usage changes in trunk. Votes: - +1: rhuijben, arfrever, stsp - + +1: markphip, rhuijben
svn commit: r1158702 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 13:48:35 2011 New Revision: 1158702 URL: http://svn.apache.org/viewvc?rev=1158702&view=rev Log: * STATUS: Approve ruby 'fix' Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158702&r1=1158701&r2=1158702&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:48:35 2011 @@ -101,14 +101,6 @@ Candidate changes: Votes: +1: rhuijben - * r1154908 - Fix spurious test failures in Ruby bindings. - Justification: - Spurious test failures are a huge distraction and time sink when - signing releases. - Votes: - +1: stsp - * r1155160 When serf restarts a web request, start parsing xml where we stopped in the previous request to avoid xml parse errors on the
svn commit: r1158698 - /subversion/branches/1.7.x/STATUS
Author: cmpilato Date: Wed Aug 17 13:44:24 2011 New Revision: 1158698 URL: http://svn.apache.org/viewvc?rev=1158698&view=rev Log: * 1.7.x/STATUS Votey, votey. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158698&r1=1158697&r2=1158698&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:44:24 2011 @@ -101,6 +101,61 @@ Candidate changes: Votes: +1: rhuijben + * r1154908 + Fix spurious test failures in Ruby bindings. + Justification: + Spurious test failures are a huge distraction and time sink when + signing releases. + Votes: + +1: stsp + + * r1155160 + When serf restarts a web request, start parsing xml where we stopped in the + previous request to avoid xml parse errors on the http://svn.webdav.org/repos/projects/neon/tags/0.29.6 wc). + I (rhuijben) call that a regression. + Votes: + +1: rhuijben + +0: stsp, cmpilato (Change looks good, but there is a merge conflict. + Please create a backport branch.) + + * r1158187, r1158196, r1158201, r1158207 + Fix issues #2557 and #3987: 'svn info symlink/to/wc'. + Justification: + That syntax should work. + Notes: + Depends on the r1158193 group. + Votes: + +1: danielsh (without r1158187) + +1: rhuijben, cmpilato + + * r1158616 + Recreate missing directories on file install errors. + Justification: + Trivial patch that fixes a variable reference in a patch that should have + handled a common user problem. The result is improved the svn cleanup + stability. + Votes: + +1: rhuijben, cmpilato + + * r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 + Cleanup JavaHL pool handling. This to improve thread safety, concurrency and + memory usage. + Justification: + This patch makes JavaHL behave better inside the JVM. + Branch: ^/subversion/branches/1.7.x-JavaHL-pools + Votes: + +1: rhuijben + +Veto-blocked changes: += + + +Approved changes: += + * r1154717, r1154718 Detect broken svndiff streams in serf (r1154717) and neon (r1154718), in non-bulk updates before we even do the md5 checksum in the update editor. @@ -108,22 +163,14 @@ Candidate changes: Some sanity checking doesn't hurt. Improves error details and avoids storing invalid streams in the pristine store. Votes: - +1: rhuijben, stsp + +1: rhuijben, stsp, cmpilato * r1154733 Correctly position buffer pointer when resuming an aborted transfer in serf. Justification: Invalid pointer operation that causes at least datastream corruption. Votes: - +1: rhuijben, stsp - - * r1154908 - Fix spurious test failures in Ruby bindings. - Justification: - Spurious test failures are a huge distraction and time sink when - signing releases. - Votes: - +1: stsp + +1: rhuijben, stsp, cmpilato * r1154982, r1155124 Stop returning APR_EGENERAL from serf for unexpected data. @@ -135,7 +182,7 @@ Candidate changes: r1154982 improves the generic errors and r1155124 restores some specific 'svn lock' behavior that was broken by r1154982. Votes: - +1: rhuijben, stsp + +1: rhuijben, stsp, cmpilato * r1155131 Cleanup the xml parser in serf in unexpected conditions. @@ -146,72 +193,25 @@ Candidate changes: This patch requires r1148932 to be backported for a clean merge. Currently accept theirs on conflict produces the right result. Votes: - +1: rhuijben, stsp - - * r1155160 - When serf restarts a web request, start parsing xml where we stopped in the - previous request to avoid xml parse errors on the http://svn.webdav.org/repos/projects/neon/tags/0.29.6 wc). - I (rhuijben) call that a regression. - Votes: - +1: rhuijben - +0: stsp (Change looks good, but there is a merge conflict. - Please create a backport branch.) + +1: rhuijben, stsp, cmpilato * r1155391, r1155404, r1156218 Fix issue 3983, import into foreign repository. Justification: It's a regression from 1.6. Votes: - +1: philip, rhuijben - - * r1158187, r1158196, r1158201, r1158207 - Fix issues #2557 and #3987: 'svn info symlink/to/wc'. - Justification: - That syntax should work. - Notes: - Depends on the r1158193 group. - Votes: - +1: danielsh (without r1158187) - +1: rhuijben + +1: philip, rhuijben, cmpilato * r1158209, r1158210, r1158217 Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'. Justification: That syntax should work. Votes: - +1: danielsh, rhuijben - - * r1158616 - Recreate missing directories on file install errors. - Justification: - Trivial patch th
svn commit: r1158696 - /subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp
Author: rhuijben Date: Wed Aug 17 13:42:11 2011 New Revision: 1158696 URL: http://svn.apache.org/viewvc?rev=1158696&view=rev Log: On the 1.7.x-JavaHL-pools branch: Properly resolve the merge conflict that made me create a branch. Found by: markphip * subversion/bindings/javahl/native/SVNClient.cpp (propertySetRemote): Provide the log message instead of NULL. Modified: subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp Modified: subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp?rev=1158696&r1=1158695&r2=1158696&view=diff == --- subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp Wed Aug 17 13:42:11 2011 @@ -918,7 +918,7 @@ void SVNClient::propertySetRemote(const Path intPath(path, subPool); SVN_JNI_ERR(intPath.error_occured(), ); -svn_client_ctx_t *ctx = context.getContext(NULL, subPool); +svn_client_ctx_t *ctx = context.getContext(message, subPool); if (ctx == NULL) return;
svn commit: r1158690 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 13:15:21 2011 New Revision: 1158690 URL: http://svn.apache.org/viewvc?rev=1158690&view=rev Log: * STATUS: Nominate the 1.7.x-JavaHL-pools branch Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158690&r1=1158689&r2=1158690&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:15:21 2011 @@ -193,12 +193,21 @@ Candidate changes: Votes: +1: rhuijben - * r1158634 -Fix error in help text of 'svn revert'. -Justification: - Help texts should document the current behaviour, not past behaviour. -Votes: - +1: stsp, rhuijben + * r1158634 + Fix error in help text of 'svn revert'. + Justification: + Help texts should document the current behaviour, not past behaviour. + Votes: + +1: stsp, rhuijben + + * r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 + Cleanup JavaHL pool handling. This to improve thread safety, concurrency and + memory usage. + Justification: + This patch makes JavaHL behave better inside the JVM. + Branch: ^/subversion/branches/1.7.x-JavaHL-pools + Votes: + +1: rhuijben Veto-blocked changes: =
svn commit: r1158688 [1/2] - in /subversion/branches/1.7.x-JavaHL-pools: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/
Author: rhuijben Date: Wed Aug 17 13:11:53 2011 New Revision: 1158688 URL: http://svn.apache.org/viewvc?rev=1158688&view=rev Log: On the 1.7.x-JavaHL-pools branch: merged r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 from trunk, resolving a small conflict caused by r1154144. Modified: subversion/branches/1.7.x-JavaHL-pools/ (props changed) subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/ClientContext.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/ClientContext.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/CopySources.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/CopySources.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/File.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/InputStream.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/JNIThreadData.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/JNIThreadData.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/JNIUtil.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/JNIUtil.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/OutputStream.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Path.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Path.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Pool.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Pool.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Prompter.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Prompter.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/RevisionRange.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/RevpropTable.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNBase.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNBase.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNRepos.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/StringArray.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Targets.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/Targets.h subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/libsvnjavahl.la.c subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Propchange: subversion/branches/1.7.x-JavaHL-pools/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 13:11:53 2011 @@ -56,4 +56,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,
svn propchange: r1158491 - svn:log
Author: cmpilato Revision: 1158491 Modified property: svn:log Modified: svn:log at Wed Aug 17 13:08:45 2011 -- --- svn:log (original) +++ svn:log Wed Aug 17 13:08:45 2011 @@ -1,6 +1,6 @@ Follow-up to r1157292. Optimize obtaining moved-to and moved-from for status by querying per-dir -where possible (suggested by: rhujiben). The original patch is modified so +where possible (suggested by: rhuijben). The original patch is modified so that the status structs for nodes return moved-* information *only* on the roots of a move, and *not* on their moved-along children. (I had intended to return these on all moved nodes, but that does not perform well at all.)
svn commit: r1158684 - /subversion/branches/1.7.x-JavaHL-pools/
Author: rhuijben Date: Wed Aug 17 13:02:44 2011 New Revision: 1158684 URL: http://svn.apache.org/viewvc?rev=1158684&view=rev Log: Create 1.7.x-JavaHL pools branch Added: subversion/branches/1.7.x-JavaHL-pools/ (props changed) - copied from r1158683, subversion/branches/1.7.x/ Propchange: subversion/branches/1.7.x-JavaHL-pools/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 17 13:02:44 2011 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/branches/1.7.x-JavaHL-pools/ -- bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/branches/1.7.x-JavaHL-pools/ -- --- svn:ignore (added) +++ svn:ignore Wed Aug 17 13:02:44 2011 @@ -0,0 +1,50 @@ +ChangeLog* +Makefile +config.cache +config.log +config.nice +config.status +configure +libtool +.gdb_history +.swig_checked +*.orig +*.rej +TAGS +tags +neon +build-outputs.mk +autogen-standalone.mk +autom4te.cache +gen-make.opts +tests.log* +fails.log +db4-win32 +db +*.o +*~ +.*~ +apr +apr-util +apr-iconv +Release +Debug +ipch +subversion_msvc.dsw +subversion_msvc.ncb +subversion_msvc.opt +subversion_msvc.plg +subversion_vcnet.sln +subversion_vcnet.ncb +subversion_vcnet.suo +subversion_vcnet.sdf +subversion_vcnet.opensdf +mkmf.log +.project +.classpath +.cdtproject +.settings +.cproject +zlib +sqlite-amalgamation +serf Propchange: subversion/branches/1.7.x-JavaHL-pools/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 17 13:02:44 2011 @@ -0,0 +1,59 @@ +/subversion/branches/1.5.x-r30215:870312 +/subversion/branches/1.7.x-issue3888:1148937-1149162 +/subversion/branches/1.7.x-neon-default:1148803-1158680 +/subversion/branches/1.7.x-r1152189:1152759-1154249 +/subversion/branches/atomic-revprop:965046-1000689 +/subversion/branches/bdb-reverse-deltas:872050-872529 +/subversion/branches/diff-callbacks3:870059-870761 +/subversion/branches/diff-optimizations:1031270-1037352 +/subversion/branches/diff-optimizations-bytes:1037353-1067789 +/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118 +/subversion/branches/double-delete:870511-872970 +/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997 +/subversion/branches/file-externals:871779-873302 +/subversion/branches/fs-rep-sharing:869036-873803 +/subversion/branches/fsfs-pack:873717-874575 +/subversion/branches/gnome-keyring:870558-871410 +/subversion/branches/http-protocol-v2:874395-876041 +/subversion/branches/in-memory-cache:869829-871452 +/subversion/branches/integrate-cache-item-serialization:1068724-1068739 +/subversion/branches/integrate-cache-membuffer:998649-998852 +/subversion/branches/integrate-compression-level:1068651-1072287 +/subversion/branches/integrate-io-improvements:1068684-1072297 +/subversion/branches/integrate-is-cachable:1072568-1074082 +/subversion/branches/integrate-partial-getter:1072558-1076552 +/subversion/branches/integrate-readline-speedup:1072553-1072555 +/subversion/branches/integrate-stream-api-extensions:1068695-1072516 +/subversion/branches/integrate-txdelta-caching:1072541-1078213 +/subversion/branches/issue-2779-dev:965496-984198 +/subversion/branches/issue-2843-dev:871432-874179 +/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734 +/subversion/branches/issue-3067-deleted-subtrees:873375-874084 +/subversion/branches/issue-3148-dev:875193-875204 +/subversion/branches/issue-3220-dev:872210-872226 +/subversion/branches/issue-3242-dev:879653-896436 +/subversion/branches/issue-3334-dirs:875156-875867 +/subversion/branches/issue-3668-3669:1031000-1035744 +/subversion/branches/kwallet:870785-871314 +/subversion/branches/log-g-performance:870941-871032 +/subversion/branches/merge-skips-obstructions:874525-874615 +/subversion/branches/nfc-nfd-aware-client:870276,870376 +/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-9
svn commit: r1158682 - in /subversion/branches/1.7.x: ./ STATUS configure.ac subversion/svn_private_config.hw subversion/tests/cmdline/svntest/main.py
Author: hwright Date: Wed Aug 17 13:01:30 2011 New Revision: 1158682 URL: http://svn.apache.org/viewvc?rev=1158682&view=rev Log: Reintegrate the 1.7.x-neon-default branch: * 1.7.x-neon-default branch Make neon the default http library. Justification: Serf's relative stability is inferior to that of the rest of Subversion, and for such a critical piece of our architecture, this is unacceptable. Subversion package producers have voiced a vote of no confidence, and plan to ship with Neon as the default: http://svn.haxx.se/dev/archive-2011-07/0751.shtml http://svn.haxx.se/dev/archive-2011-06/0796.shtml Bug reports of the crash variety continue to be reported: http://svn.haxx.se/dev/archive-2011-07/0735.shtml Serf floods the target server with orders of magniture more requests, resulting in undesirable server log bloat. Further, the promise of performance has not been realized: https://ctf.open.collab.net/sf/wiki/do/viewPage/projects.csvn/wiki/HTTPv2 (As an aside, Serf's potential as a platform for future improvement remains unproven and doubtful. For example, HTTPv2 removes canonical resource URLs, which works against the caching proxy concept that seems to be the strongest argument in favor of Serf's approach. But that's not strictly germane here.) rhuijben: Trivial problems like r1153138 and less trivial compatibility problems like r1154278 should have been fixed a long time ago if we don't want to delay releasing 1.7.0 on this kind of serf problems. markphip: I understand why *we* would want Serf as default, so we can make it better, but it goes against all of the other conservatism in this project to make this the default when we *know* it is less stable, potentially lacks some of the features and is generally considerably slower than Neon. Serf's use of chunked transfer encoding means that it isn't supported by some HTTP proxies. Votes: +1: philip, cmpilato, rhuijben, markphip +0: gstein (per my comments in issue 3979, I believe we need a solution to probe the server with HTTP/1.1 support, then fall back to HTTP/1.0 support as needed; possibly some config support and other bits; I believe this is necessary for ra_serf as a default, yet doing this *properly* is not possible for the 1.7 release) Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/configure.ac subversion/branches/1.7.x/subversion/svn_private_config.hw subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 13:01:30 2011 @@ -1,5 +1,6 @@ /subversion/branches/1.5.x-r30215:870312 /subversion/branches/1.7.x-issue3888:1148937-1149162 +/subversion/branches/1.7.x-neon-default:1148803-1158680 /subversion/branches/1.7.x-r1152189:1152759-1154249 /subversion/branches/atomic-revprop:965046-1000689 /subversion/branches/bdb-reverse-deltas:872050-872529 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158682&r1=1158681&r2=1158682&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:01:30 2011 @@ -206,52 +206,3 @@ Veto-blocked changes: Approved changes: = - - * 1.7.x-neon-default branch - Make neon the default http library. - Justification: - Serf's relative stability is inferior to that of the rest of - Subversion, and for such a critical piece of our architecture, - this is unacceptable. - - Subversion package producers have voiced a vote of no confidence, - and plan to ship with Neon as the default: - http://svn.haxx.se/dev/archive-2011-07/0751.shtml - http://svn.haxx.se/dev/archive-2011-06/0796.shtml - - Bug reports of the crash variety continue to be reported: - http://svn.haxx.se/dev/archive-2011-07/0735.shtml - - Serf floods the target server with orders of magniture more - requests, resulting in undesirable server log bloat. - - Further, the promise of performance has not been realized: - https://ctf.open.collab.net/sf/wiki/do/viewPage/projects.csvn/wiki/HTTPv2 - - (As an aside, Serf's potential as a platform for future - improvement remains unproven and doubtful. For example, HTTPv2 - removes canonical resource URLs, which works against the caching - proxy concept that seems to be the strongest argument in favor of - Serf's approach. But that's not strictly germane here.) - - rhuijben: Trivial problems like r11
svn commit: r1158680 - in /subversion/branches/1.7.x: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/tigris/subve
Author: hwright Date: Wed Aug 17 12:59:34 2011 New Revision: 1158680 URL: http://svn.apache.org/viewvc?rev=1158680&view=rev Log: Merge r1158421, r1158436, r1158455 from trunk, resolving conflicts as noted: * r1154165 Make the cmdline argument parser ignore upgrade required errors to allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an error. Justification: Usually svn allows case differences, but in this case it doesn't. (Triggerable in other scenarios) http://svn.haxx.se/users/archive-2011-08/0142.shtml Votes: +1: rhuijben, arfrever, stsp Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.h subversion/branches/1.7.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Propchange: subversion/branches/1.7.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 12:59:34 2011 @@ -55,4 +55,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158680&r1=1158679&r2=1158680&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:59:34 2011 @@ -255,12 +255,3 @@ Approved changes: believe this is necessary for ra_serf as a default, yet doing this *properly* is not possible for the 1.7 release) - - * r1158421, r1158436, r1158455 - JavaHL: Fix implementation of propertySetRemote method. - Justification: - The new method is not usable without these changes. - NOTE: This has trivial merge conflicts that need to be resolved due - to the JavaHL pool usage changes in trunk. - Votes: - +1: markphip, rhuijben Modified: subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp?rev=1158680&r1=1158679&r2=1158680&view=diff == --- subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp Wed Aug 17 12:59:34 2011 @@ -898,7 +898,9 @@ void SVNClient::propertySetLocal(Targets ctx, requestPool.pool()), ); } -
svn commit: r1158667 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/cmdline.c
Author: hwright
Date: Wed Aug 17 12:46:10 2011
New Revision: 1158667
URL: http://svn.apache.org/viewvc?rev=1158667&view=rev
Log:
Merge r1154165 from trunk:
* r1154165
Make the cmdline argument parser ignore upgrade required errors to
allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
error.
Justification:
Usually svn allows case differences, but in this case it doesn't.
(Triggerable in other scenarios)
http://svn.haxx.se/users/archive-2011-08/0142.shtml
Votes:
+1: rhuijben, arfrever, stsp
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/cmdline.c
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 12:46:10 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158667&r1=1158666&r2=1158667&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:46:10 2011
@@ -264,15 +264,3 @@ Approved changes:
to the JavaHL pool usage changes in trunk.
Votes:
+1: markphip, rhuijben
-
- * r1154165
- Make the cmdline argument parser ignore upgrade required errors to
- allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
- error.
- Justification:
- Usually svn allows case differences, but in this case it doesn't.
- (Triggerable in other scenarios)
- http://svn.haxx.se/users/archive-2011-08/0142.shtml
- Votes:
- +1: rhuijben, arfrever, stsp
-
Modified: subversion/branches/1.7.x/subversion/libsvn_client/cmdline.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/cmdline.c?rev=1158667&r1=1158666&r2=1158667&view=diff
==
--- subversion/branches/1.7.x/subversion/libsvn_client/cmdline.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/cmdline.c Wed Aug 17
12:46:10 2011
@@ -292,7 +292,9 @@ svn_client_args_to_target_array2(apr_arr
original_target, pool));
err2 = svn_wc_read_kind(&kind, ctx->wc_ctx, target_abspath,
FALSE, pool);
- if (err2 && err2->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
+ if (err2
+ && (err2->apr_err == SVN_ERR_WC_NOT_WORKING_COPY
+ || err2->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED))
{
svn_error_clear(err2);
}
svn commit: r1158664 - in /subversion/branches/1.7.x: ./ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/tigris/subversion/javahl/ subversion/bindings/j
Author: hwright
Date: Wed Aug 17 12:42:39 2011
New Revision: 1158664
URL: http://svn.apache.org/viewvc?rev=1158664&view=rev
Log:
Merge r1157416 from trunk:
* r1157416
Fix problem with a missing JavaHL class from package renaming.
Justification:
When this error occurrs, users receive Class not found exception
instead of the error.
Votes:
+1: markphip, rhuijben
Added:
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
- copied unchanged from r1157416,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
Removed:
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.7.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 12:42:39 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1158193-1158194,1158285,1158288,1158303
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158664&r1=1158663&r2=1158664&view=diff
==
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:42:39 2011
@@ -265,14 +265,6 @@ Approved changes:
Votes:
+1: markphip, rhuijben
- * r1157416
- Fix problem with a missing JavaHL class from package renaming.
- Justification:
- When this error occurrs, users receive Class not found exception
- instead of the error.
- Votes:
- +1: markphip, rhuijben
-
* r1154165
Make the cmdline argument parser ignore upgrade required errors to
allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
Modified:
subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1158664&r1=1158663&r2=1158664&view=diff
==
---
subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Wed Aug 17 12:42:39 2011
@@ -130,6 +130,35 @@ public class BasicTests extends SVNTests
}
/**
+ * Test the JNIError class functionality
+ * @throws Throwable
+ */
+public void testJNIError() throws Throwable
+{
+// build the test setup.
+OneTest thisTest = new OneTest();
+
+// Create a client, dispose it, then try to use it later
+ISVNClient tempclient = new SVNClient();
+tempclient.dispose();
+
+// create Y and Y/Z directories in the repository
+addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y",
svn commit: r1158663 - /subversion/branches/1.7.x/STATUS
Author: markphip Date: Wed Aug 17 12:42:18 2011 New Revision: 1158663 URL: http://svn.apache.org/viewvc?rev=1158663&view=rev Log: * STATUS: Add note about merging r1158421, r1158436, r1158455. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158663&r1=1158662&r2=1158663&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:42:18 2011 @@ -260,6 +260,8 @@ Approved changes: JavaHL: Fix implementation of propertySetRemote method. Justification: The new method is not usable without these changes. + NOTE: This has trivial merge conflicts that need to be resolved due + to the JavaHL pool usage changes in trunk. Votes: +1: markphip, rhuijben
svn commit: r1158650 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 12:06:38 2011 New Revision: 1158650 URL: http://svn.apache.org/viewvc?rev=1158650&view=rev Log: * STATUS: Cast some votes. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158650&r1=1158649&r2=1158650&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:06:38 2011 @@ -49,6 +49,7 @@ Candidate changes: Backporting of future changes will be easier. Votes: +1: arfrever + -0: stsp (we can backport these when we need to) * r1148083, r1148094 Preload libsvn_auth_gnome_keyring and libsvn_auth_kwallet in locally built @@ -83,17 +84,6 @@ Candidate changes: -0: gstein (the serf 2.x API will be incompatible with 1.7.x, so this will never be useful) - * r1154165 - Make the cmdline argument parser ignore upgrade required errors to - allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an - error. - Justification: - Usually svn allows case differences, but in this case it doesn't. - (Triggerable in other scenarios) - http://svn.haxx.se/users/archive-2011-08/0142.shtml - Votes: - +1: rhuijben, arfrever - * r1154278, r1154379, r1154382 Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using ra_serf. @@ -118,14 +108,14 @@ Candidate changes: Some sanity checking doesn't hurt. Improves error details and avoids storing invalid streams in the pristine store. Votes: - +1: rhuijben + +1: rhuijben, stsp * r1154733 Correctly position buffer pointer when resuming an aborted transfer in serf. Justification: Invalid pointer operation that causes at least datastream corruption. Votes: - +1: rhuijben + +1: rhuijben, stsp * r1154908 Fix spurious test failures in Ruby bindings. @@ -145,7 +135,7 @@ Candidate changes: r1154982 improves the generic errors and r1155124 restores some specific 'svn lock' behavior that was broken by r1154982. Votes: - +1: rhuijben + +1: rhuijben, stsp * r1155131 Cleanup the xml parser in serf in unexpected conditions. @@ -156,7 +146,7 @@ Candidate changes: This patch requires r1148932 to be backported for a clean merge. Currently accept theirs on conflict produces the right result. Votes: - +1: rhuijben + +1: rhuijben, stsp * r1155160 When serf restarts a web request, start parsing xml where we stopped in the @@ -167,6 +157,8 @@ Candidate changes: I (rhuijben) call that a regression. Votes: +1: rhuijben + +0: stsp (Change looks good, but there is a merge conflict. + Please create a backport branch.) * r1155391, r1155404, r1156218 Fix issue 3983, import into foreign repository. @@ -279,3 +271,14 @@ Approved changes: Votes: +1: markphip, rhuijben + * r1154165 + Make the cmdline argument parser ignore upgrade required errors to + allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an + error. + Justification: + Usually svn allows case differences, but in this case it doesn't. + (Triggerable in other scenarios) + http://svn.haxx.se/users/archive-2011-08/0142.shtml + Votes: + +1: rhuijben, arfrever, stsp +
svn commit: r1158637 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 11:30:22 2011 New Revision: 1158637 URL: http://svn.apache.org/viewvc?rev=1158637&view=rev Log: * STATUS: Cast a vote and move a binding change to the approved section Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158637&r1=1158636&r2=1158637&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 11:30:22 2011 @@ -175,14 +175,6 @@ Candidate changes: Votes: +1: philip, rhuijben -* r1157416 - Fix problem with a missing JavaHL class from package renaming. - Justification: - When this error occurrs, users receive Class not found exception - instead of the error. - Votes: - +1: markphip, rhuijben - * r1158187, r1158196, r1158201, r1158207 Fix issues #2557 and #3987: 'svn info symlink/to/wc'. Justification: @@ -214,7 +206,7 @@ Candidate changes: Justification: Help texts should document the current behaviour, not past behaviour. Votes: - +1: stsp + +1: stsp, rhuijben Veto-blocked changes: = @@ -278,3 +270,12 @@ Approved changes: The new method is not usable without these changes. Votes: +1: markphip, rhuijben + + * r1157416 + Fix problem with a missing JavaHL class from package renaming. + Justification: + When this error occurrs, users receive Class not found exception + instead of the error. + Votes: + +1: markphip, rhuijben +
svn commit: r1158636 - /subversion/branches/1.7.x/STATUS
Author: stsp Date: Wed Aug 17 11:29:01 2011 New Revision: 1158636 URL: http://svn.apache.org/viewvc?rev=1158636&view=rev Log: * STATUS: Nominate r1158634. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158636&r1=1158635&r2=1158636&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 11:29:01 2011 @@ -209,6 +209,13 @@ Candidate changes: Votes: +1: rhuijben + * r1158634 +Fix error in help text of 'svn revert'. +Justification: + Help texts should document the current behaviour, not past behaviour. +Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1158634 - /subversion/trunk/subversion/svn/main.c
Author: stsp
Date: Wed Aug 17 11:27:00 2011
New Revision: 1158634
URL: http://svn.apache.org/viewvc?rev=1158634&view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): Fix an error in the 'svn revert' help text.
The text used to say that 'svn revert' didn't restore removed directories
(removed via OS commands, not 'svn rm'). This was true in 1.6, but is not
true anymore in 1.7.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1158634&r1=1158633&r2=1158634&view=diff
==
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Aug 17 11:27:00 2011
@@ -1184,7 +1184,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"usage: revert PATH...\n"
"\n"
" Note: this subcommand does not require network access, and resolves\n"
- " any conflicted states. However, it does not restore removed
directories.\n"),
+ " any conflicted states.\n"),
{opt_targets, 'R', opt_depth, 'q', opt_changelist} },
{ "status", svn_cl__status, {"stat", "st"}, N_
svn commit: r1158629 - /subversion/branches/1.7.x/STATUS
Author: rhuijben Date: Wed Aug 17 11:12:03 2011 New Revision: 1158629 URL: http://svn.apache.org/viewvc?rev=1158629&view=rev Log: * STATUS: Nominate r1158616 and cast vote on JavaHL patch Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158629&r1=1158628&r2=1158629&view=diff == --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 11:12:03 2011 @@ -200,12 +200,14 @@ Candidate changes: Votes: +1: danielsh, rhuijben -* r1158421, r1158436, r1158455 - JavaHL: Fix implementation of propertySetRemote method. - Justification: -The new method is not usable without these changes. - Votes: -+1: markphip + * r1158616 + Recreate missing directories on file install errors. + Justification: + Trivial patch that fixes a variable reference in a patch that should have + handled a common user problem. The result is improved the svn cleanup + stability. + Votes: + +1: rhuijben Veto-blocked changes: = @@ -262,3 +264,10 @@ Approved changes: believe this is necessary for ra_serf as a default, yet doing this *properly* is not possible for the 1.7 release) + + * r1158421, r1158436, r1158455 + JavaHL: Fix implementation of propertySetRemote method. + Justification: + The new method is not usable without these changes. + Votes: + +1: markphip, rhuijben
svn propchange: r1158617 - svn:log
Author: stsp Revision: 1158617 Modified property: svn:log Modified: svn:log at Wed Aug 17 10:44:59 2011 -- --- svn:log (original) +++ svn:log Wed Aug 17 10:44:59 2011 @@ -71,4 +71,5 @@ Review by: julianfoad * subversion/libsvn_wc/wc_db.h (svn_wc__db_revert_list_read): Declare new output parameters COPIED_HERE, KIND, and PRISTINE_CHECKSUM. Update docstring. + (svn_wc__db_revert_list_copied_child_info_t): New. (svn_wc__db_revert_list_read_copied_children): Declare.
svn commit: r1158619 - /subversion/trunk/CHANGES
Author: stsp Date: Wed Aug 17 10:42:16 2011 New Revision: 1158619 URL: http://svn.apache.org/viewvc?rev=1158619&view=rev Log: * CHANGES: Add an entry for issue #3101, fixed for 1.8. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1158619&r1=1158618&r2=1158619&view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Wed Aug 17 10:42:16 2011 @@ -2,6 +2,9 @@ Version 1.8.0 (?? ??? 2011, from /branches/1.8.x) http://svn.apache.org/repos/asf/subversion/tags/1.8.0 + User-visible changes: +* don't leave unversioned files when reverting copies (issue #3101) + Developer-visible changes: - API changes: * fix inconsistent handling of log revs without changed paths (issue #3694)
svn commit: r1158617 - in /subversion/trunk/subversion: libsvn_wc/ tests/cmdline/
Author: stsp Date: Wed Aug 17 10:33:12 2011 New Revision: 1158617 URL: http://svn.apache.org/viewvc?rev=1158617&view=rev Log: Remove reverted copied files and directories from disk, if they weren't modified after being copied. To achieve this we add more columns to rows in the revert list: the node kind, the repos_id (which is not NULL for copies), the op_root, and, if the node is a file, the pristine checksum. While restoring the BASE on-disk state, process nodes in the revert list marked as copies in a special way: Compare reverted copied files with their pristines, and remove the ones that match from disk. Next, remove any reverted copied directories which are left empty as a result. This commit addresses issues #3101 and #876, and my own annoyance at unversioned things left behind in my testing WCs (been testing 'svn move' with subsequent 'revert' a lot lately). We could take this further and remove copied files which were modified post-copy (after all, we also destroy textual modifications to files which were not copied). But that's a decision for another day. Review by: julianfoad * subversion/tests/cmdline/merge_tests.py (merge_away_subtrees_noninheritable_ranges): No longer need to remove unversioned files after revert. * subversion/tests/cmdline/depth_tests.py (excluded_path_misc_operation): No longer need to remove unversioned files after revert. * subversion/tests/cmdline/revert_tests.py (status_of_missing_dir_after_revert_replaced_with_history_dir): No longer need to remove unversioned files. And don't expect them in status output. * subversion/libsvn_wc/adm_ops.c (revert_restore_handle_copied_file, revert_restore_handle_copied_dirs, compare_revert_list_copied_children): New. (revert_restore): When reverting copies, remove their remains from disk, except for files which were modified after being copied, and directories that contain unversioned files. * subversion/libsvn_wc/wc-queries.sql (revert_list): Add new columns OP_DEPTH, REPOS_ID, KIND, CHECKSUM. Copy values from rows deleted from the NODES table into them. Nothing changes for actual-only nodes. (STMT_SELECT_REVERT_LIST): Get the new columns. (STMT_SELECT_REVERT_LIST_COPIED_CHILDREN): New statement which returns all copied children within a given reverted local_relpath. * subversion/libsvn_wc/wc.h (svn_wc__compare_file_with_pristine): Declare. * subversion/libsvn_wc/questions.c (compare_and_verify): Renamed to ... (svn_wc__compare_file_with_pristine): ... this, so the revert code can access this function. No modifications were made to the implementation. (svn_wc__internal_file_modified_p): Track above function rename. * subversion/libsvn_wc/wc_db.c (revert_list_read_baton): Add COPIED_HERE, KIND, and PRISTINE_CHECKSUM. (revert_list_read): Populate the new baton fields. (svn_wc__db_revert_list_read): Add COPIED_HERE, KIND, and PRISTINE_CHECKSUM output parameters. (revert_list_read_copied_children_baton): New. (revert_list_read_copied_children): New. Returns a list of all copied children which existed within a reverted subtree. (svn_wc__db_revert_list_read_copied_children): Exposes the revert_list_read_copied_children() function, wrapping it in an sqlite transaction. * subversion/libsvn_wc/wc_db.h (svn_wc__db_revert_list_read): Declare new output parameters COPIED_HERE, KIND, and PRISTINE_CHECKSUM. Update docstring. (svn_wc__db_revert_list_read_copied_children): Declare. Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c subversion/trunk/subversion/libsvn_wc/questions.c subversion/trunk/subversion/libsvn_wc/wc-queries.sql subversion/trunk/subversion/libsvn_wc/wc.h subversion/trunk/subversion/libsvn_wc/wc_db.c subversion/trunk/subversion/libsvn_wc/wc_db.h subversion/trunk/subversion/tests/cmdline/depth_tests.py subversion/trunk/subversion/tests/cmdline/merge_tests.py subversion/trunk/subversion/tests/cmdline/revert_tests.py Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1158617&r1=1158616&r2=1158617&view=diff == --- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original) +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Aug 17 10:33:12 2011 @@ -29,6 +29,7 @@ #include +#include #include #include @@ -1291,6 +1292,186 @@ remove_conflict_file(svn_boolean_t *noti } +/* Remove the reverted copied file at LOCAL_ABSPATH from disk if it was + * not modified after being copied. Use FILESIZE and PRISTINE_CHECKSUM to + * detect modification. + * If NEW_KIND is not NULL, return the resulting on-disk kind of the node + * at LOCAL_ABSPATH in *NEW_KIND. */ +static svn_error_t * +revert_restore_handle_copied_file(svn_node_kind_t *new_kind, + svn_wc__db_t *db, +
svn commit: r1158616 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Author: rhuijben
Date: Wed Aug 17 10:32:38 2011
New Revision: 1158616
URL: http://svn.apache.org/viewvc?rev=1158616&view=rev
Log:
Following up on r1142088, make sure the destination folder exists. We are not
interested in the tempfolder.
* subversion/libsvn_wc/workqueue.c
(run_file_install): Remove two obsolete comments and ensure that the
destination folder exists.
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1158616&r1=1158615&r2=1158616&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Wed Aug 17 10:32:38 2011
@@ -733,10 +733,7 @@ run_file_install(svn_wc__db_t *db,
cancel_func, cancel_baton,
scratch_pool));
- /* ### post-commit feature: avoid overwrite if same as working file. */
-
/* All done. Move the file into place. */
- /* ### fix this. we should delay the rename. */
{
svn_error_t *err;
@@ -750,7 +747,7 @@ run_file_install(svn_wc__db_t *db,
{
svn_error_t *err2;
-err2 = svn_io_make_dir_recursively(svn_dirent_dirname(dst_abspath,
+err2 = svn_io_make_dir_recursively(svn_dirent_dirname(local_abspath,
scratch_pool),
scratch_pool);
svn commit: r1158563 - /subversion/site/publish/docs/release-notes/1.7.html
Author: stsp Date: Wed Aug 17 08:15:57 2011 New Revision: 1158563 URL: http://svn.apache.org/viewvc?rev=1158563&view=rev Log: * publish/docs/release-notes/1.7.html: Say 'serf' instead of 'libsvn_ra_serf' in the compat table -- it's shorter and precise enough. Modified: subversion/site/publish/docs/release-notes/1.7.html Modified: subversion/site/publish/docs/release-notes/1.7.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1158563&r1=1158562&r2=1158563&view=diff == --- subversion/site/publish/docs/release-notes/1.7.html (original) +++ subversion/site/publish/docs/release-notes/1.7.html Wed Aug 17 08:15:57 2011 @@ -116,7 +116,7 @@ via calls to the svn_ra.h i Permutations of older client/server combinations will continue to function at the pre-1.7 feature level. Server-side configuration changes might be required for optimal performance with clients that - use libsvn_ra_serf (see below). + use serf. WC-NG 1.7
svn commit: r1158565 - /subversion/site/publish/docs/release-notes/1.7.html
Author: stsp Date: Wed Aug 17 08:17:45 2011 New Revision: 1158565 URL: http://svn.apache.org/viewvc?rev=1158565&view=rev Log: * publish/docs/release-notes/1.7.html (sef): Say 'neon' instead of 'libsvn_ra_neon' -- we don't need to be that technical here. Modified: subversion/site/publish/docs/release-notes/1.7.html Modified: subversion/site/publish/docs/release-notes/1.7.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1158565&r1=1158564&r2=1158565&view=diff == --- subversion/site/publish/docs/release-notes/1.7.html (original) +++ subversion/site/publish/docs/release-notes/1.7.html Wed Aug 17 08:17:45 2011 @@ -880,7 +880,7 @@ But because of some remaining issues (fo >issue #3980, and http://subversion.tigris.org/issues/show_bug.cgi?id=3981"; >issue #3981), -Subversion 1.7 still uses libsvn_ra_neon by default. +Subversion 1.7 still uses neon by default. Remaining problems are mostly due to insufficient infrastructure deployed in the wild wild web, such as HTTP proxies that do not support HTTP/1.1. Workarounds for these problems will be implemented for the next release.
svn commit: r1158561 - /subversion/site/publish/docs/release-notes/1.7.html
Author: stsp Date: Wed Aug 17 08:11:35 2011 New Revision: 1158561 URL: http://svn.apache.org/viewvc?rev=1158561&view=rev Log: * publish/docs/release-notes/1.7.html: Update information about serf. Modified: subversion/site/publish/docs/release-notes/1.7.html Modified: subversion/site/publish/docs/release-notes/1.7.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1158561&r1=1158560&r2=1158561&view=diff == --- subversion/site/publish/docs/release-notes/1.7.html (original) +++ subversion/site/publish/docs/release-notes/1.7.html Wed Aug 17 08:11:35 2011 @@ -115,8 +115,8 @@ via calls to the svn_ra.h i any Permutations of older client/server combinations will continue to function at the pre-1.7 feature level. Server-side configuration - changes might be required for optimal performance (see - below). + changes might be required for optimal performance with clients that + use libsvn_ra_serf (see below). WC-NG 1.7 @@ -501,9 +501,9 @@ materialized. connecting to supported servers. This simpler protocol (sometimes referred to as HTTPv2) requires fewer client-server round trips to establish a connection, making Subversion much more performant on high-latency network -connections. Subversion's Serf-based repository access library (which is -now the default library for HTTP use) has received all of -the protocol changes scheduled for 1.7, affecting both commit and read +connections. Subversion's Serf-based repository access library (which will +become the default library for HTTP in Subversion 1.8) has received +all of the protocol changes scheduled for 1.7, affecting both commit and read operations; the older Neon-based library has received the most important and high-impact of these changes, too. @@ -862,17 +862,39 @@ for details. -Serf now default HTTP library (client) +Serf HTTP library improved and stabilized (client) ΒΆ -http://code.google.com/p/serf/";>serf is now the default library -used for accessing HTTP-based repositories. You can still build and use the -http://www.webdav.org/neon/";>neon library, as you always have, and -configure which library the client should use on -a default or host-by-host basis by setting the http-library -variable in the client-side servers configuration file +The libsvn_ra_serf repository access library has received +a lot of improvements and stabilization. +The design of http://code.google.com/p/serf/";>serf facilitates +future performance improvements that are impossible to achieve with +http://www.webdav.org/neon/";>neon. There were plans to make +serf the default HTTP access library for the 1.7 release. +But because of some remaining issues (for instance +http://subversion.tigris.org/issues/show_bug.cgi?id=3979"; + >issue #3979, +http://subversion.tigris.org/issues/show_bug.cgi?id=3980"; + >issue #3980, and +http://subversion.tigris.org/issues/show_bug.cgi?id=3981"; + >issue #3981), +Subversion 1.7 still uses libsvn_ra_neon by default. +Remaining problems are mostly due to insufficient infrastructure deployed +in the wild wild web, such as HTTP proxies that do not support HTTP/1.1. +Workarounds for these problems will be implemented for the next release. +serf will become the default HTTP access library in Subversion 1.8. + + +In the meantime, we encourage all users to try serf with Subversion 1.7 and +report any problems. Successful test reports are appreciated as well. +Tests in networks that use HTTP proxies or enterprise authentication are +particularly helpful. +You can configure which library the client should use on a default or +host-by-host basis by setting the http-library variable in the +client-side servers configuration file (~/.subversion/servers).
