svn commit: r1358072 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 08:28:50 2012 New Revision: 1358072 URL: http://svn.apache.org/viewvc?rev=1358072view=rev Log: * subversion/svn/file-merge.c (merge_chunks): Cosmetic tweaks: Properly align the separator line and indent both left and right version of the chunk in the same way

svn commit: r1358088 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 09:29:13 2012 New Revision: 1358088 URL: http://svn.apache.org/viewvc?rev=1358088view=rev Log: * subversion/svn/file-merge.c (read_diff_chunk): Do not drop empty lines read from the chunk. Modified: subversion/trunk/subversion/svn/file-merge.c Modified

svn commit: r1358091 - /subversion/trunk/subversion/svn/conflict-callbacks.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 09:31:16 2012 New Revision: 1358091 URL: http://svn.apache.org/viewvc?rev=1358091view=rev Log: * subversion/svn/conflict-callbacks.c (launch_resolver): Suggest trying the (m) merge option if an error ocurred while launching an external merge tool. Modified

svn commit: r1358093 - in /subversion/trunk/subversion/svn: cl.h conflict-callbacks.c file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 09:38:11 2012 New Revision: 1358093 URL: http://svn.apache.org/viewvc?rev=1358093view=rev Log: Add chunk editiing support to the new internal file merge tool. * subversion/svn/cl.h (svn_cl__merge_file): Add editor_cmd parameter to declaration. * subversion/svn

svn propchange: r1358093 - svn:log

2012-07-06 Thread stsp
Author: stsp Revision: 1358093 Modified property: svn:log Modified: svn:log at Fri Jul 6 09:38:48 2012 -- --- svn:log (original) +++ svn:log Fri Jul 6 09:38:48 2012 @@ -1,4 +1,4 @@ -Add chunk editiing support to the new

svn commit: r1358101 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 10:06:38 2012 New Revision: 1358101 URL: http://svn.apache.org/viewvc?rev=1358101view=rev Log: Cosmetic tweaks for the interactive merge tool side-by-side display. * subversion/svn/file-merge.c (prepare_line_for_display): Always use the LINE_DISPLAY_WIDTH constant

svn commit: r1358105 - /subversion/trunk/CHANGES

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 10:22:34 2012 New Revision: 1358105 URL: http://svn.apache.org/viewvc?rev=1358105view=rev Log: * CHANGES: List the built-in file merge tool as minor improvement for 1.8. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http

svn commit: r1358110 - in /subversion/trunk/subversion: include/svn_io.h libsvn_diff/parse-diff.c libsvn_subr/io.c svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 10:45:21 2012 New Revision: 1358110 URL: http://svn.apache.org/viewvc?rev=1358110view=rev Log: Promote two identical readline() helper functions to one svn_io_file_readline() public API function. * subversion/include/svn_io.h (svn_io_file_readline): Declare

svn commit: r1358122 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 11:11:35 2012 New Revision: 1358122 URL: http://svn.apache.org/viewvc?rev=1358122view=rev Log: * subversion/svn/file-merge.c (LINE_DISPLAY_WIDTH): Increase to fill 78 columns. (SEP_STRING): Adjust to match above change. Modified: subversion/trunk/subversion

svn commit: r1358173 - /subversion/site/publish/docs/release-notes/1.8.html

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 12:53:00 2012 New Revision: 1358173 URL: http://svn.apache.org/viewvc?rev=1358173view=rev Log: * publish/docs/release-notes/1.8.html: Document a couple of conflict resolution enhancements in the 'svn' client. Modified: subversion/site/publish/docs/release

svn commit: r1358315 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 17:35:03 2012 New Revision: 1358315 URL: http://svn.apache.org/viewvc?rev=1358315view=rev Log: Make the interactive merge tool side-by-side display use the full terminal width on platforms that support either getenv(COLUMNS) or the TIOCGWINSZ ioctl() call. For other

svn commit: r1358328 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 18:17:12 2012 New Revision: 1358328 URL: http://svn.apache.org/viewvc?rev=1358328view=rev Log: * subversion/svn/file-merge.c (get_term_width): Always return at least 80 columns width. Other output from 'svn' tends to assume at least 80 columns width, too (e.g

svn commit: r1358374 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 19:46:06 2012 New Revision: 1358374 URL: http://svn.apache.org/viewvc?rev=1358374view=rev Log: * subversion/svn/file-merge.c (svn_cl__merge_file): Do not operate directly on the file at merged_path, but on a temporary file and rename that on top

svn commit: r1358401 - /subversion/trunk/subversion/svn/file-merge.c

2012-07-06 Thread stsp
Author: stsp Date: Fri Jul 6 20:19:44 2012 New Revision: 1358401 URL: http://svn.apache.org/viewvc?rev=1358401view=rev Log: Allow exiting from the interactive file merge tool without having to postpone every conflicting section in the file. Suggested by: jcorvel * subversion/svn/file-merge.c

svn commit: r1366083 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-07-26 Thread stsp
Author: stsp Date: Thu Jul 26 16:56:31 2012 New Revision: 1366083 URL: http://svn.apache.org/viewvc?rev=1366083view=rev Log: * tools/dev/unix-build/Makefile.svn: Fix neon build with OpenSSL lacking support for SSLv2. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified

svn commit: r1366341 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-07-27 Thread stsp
Author: stsp Date: Fri Jul 27 11:26:06 2012 New Revision: 1366341 URL: http://svn.apache.org/viewvc?rev=1366341view=rev Log: * tools/dev/unix-build/Makefile.svn: Try to fix neon build with SSLv2-enabled OpenSSL. Will hopefully fix the bb-openbsd buildbot. Modified: subversion/trunk/tools

svn commit: r1367892 - /subversion/site/publish/mailing-lists.html

2012-08-01 Thread stsp
Author: stsp Date: Wed Aug 1 09:04:39 2012 New Revision: 1367892 URL: http://svn.apache.org/viewvc?rev=1367892view=rev Log: * site/publish/mailing-lists.html: Point people at the Subversion book as well as the archives. Some posters on the users list seem unaware of the fact that the book

svn commit: r1367893 - /subversion/site/publish/mailing-lists.html

2012-08-01 Thread stsp
Author: stsp Date: Wed Aug 1 09:06:17 2012 New Revision: 1367893 URL: http://svn.apache.org/viewvc?rev=1367893view=rev Log: * site/publish/mailing-lists.html: Try to get nicer spacing in the yellow box. Modified: subversion/site/publish/mailing-lists.html Modified: subversion/site/publish

svn commit: r1367894 - /subversion/site/publish/mailing-lists.html

2012-08-01 Thread stsp
Author: stsp Date: Wed Aug 1 09:08:35 2012 New Revision: 1367894 URL: http://svn.apache.org/viewvc?rev=1367894view=rev Log: * site/publish/mailing-lists.html: Use shorter wording and less horizontal spacing in the yellow box on this page. Modified: subversion/site/publish/mailing

svn commit: r1369307 - /subversion/site/publish/docs/release-notes/1.8.html

2012-08-04 Thread stsp
Author: stsp Date: Sat Aug 4 12:39:20 2012 New Revision: 1369307 URL: http://svn.apache.org/viewvc?rev=1369307view=rev Log: * publish/docs/release-notes/1.8.html (file-merge-tool): Show current version of file merge prompt text. Modified: subversion/site/publish/docs/release-notes/1.8

svn commit: r1369577 - in /subversion/trunk/subversion/svn: cl.h conflict-callbacks.c file-merge.c

2012-08-05 Thread stsp
Author: stsp Date: Sun Aug 5 13:21:31 2012 New Revision: 1369577 URL: http://svn.apache.org/viewvc?rev=1369577view=rev Log: Provide additional notifications at the beginning and end of a file merge. * subversion/svn/cl.h (svn_cl__merge_file): Declare path_prefix parameter. * subversion/svn

svn commit: r1369584 - /subversion/trunk/subversion/svn/file-merge.c

2012-08-05 Thread stsp
Author: stsp Date: Sun Aug 5 13:41:18 2012 New Revision: 1369584 URL: http://svn.apache.org/viewvc?rev=1369584view=rev Log: * subversion/svn/file-merge.c (svn_cl__merge_file): Leave the file in conflict if installing the merged result fails and extend the corresponding error message

svn commit: r1369594 - /subversion/site/publish/docs/release-notes/1.8.html

2012-08-05 Thread stsp
Author: stsp Date: Sun Aug 5 14:05:40 2012 New Revision: 1369594 URL: http://svn.apache.org/viewvc?rev=1369594view=rev Log: * publish/docs/release-notes/1.8.html (file-merge-tool): I've tweaked the output again so update the example output in the release notes, too. Modified

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

2012-08-29 Thread stsp
Author: stsp Date: Wed Aug 29 15:42:34 2012 New Revision: 1378618 URL: http://svn.apache.org/viewvc?rev=1378618view=rev Log: * STATUS (for 1.6.x): Fix a typo. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1380269 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-09-03 Thread stsp
Author: stsp Date: Mon Sep 3 15:17:14 2012 New Revision: 1380269 URL: http://svn.apache.org/viewvc?rev=1380269view=rev Log: * tools/dev/unix-build/Makefile.svn: Fix a new build error during cyrus-sasl compilation. For some reason it now expects the saslauthd/cmulocal directory to exist

svn commit: r1380608 - in /subversion/trunk/subversion: include/ libsvn_ra_local/ libsvn_repos/ mod_dav_svn/ svnserve/

2012-09-04 Thread stsp
Author: stsp Date: Tue Sep 4 12:43:40 2012 New Revision: 1380608 URL: http://svn.apache.org/viewvc?rev=1380608view=rev Log: Fix issue #4113, convert SVNHooksEnv and svnserve.conf[hooks-env] to use a common configuration files. The hook environment is now specified in a separate configuration

svn commit: r1380697 - /subversion/trunk/subversion/libsvn_client/diff.c

2012-09-04 Thread stsp
Author: stsp Date: Tue Sep 4 15:52:47 2012 New Revision: 1380697 URL: http://svn.apache.org/viewvc?rev=1380697view=rev Log: * subversion/libsvn_client/diff.c: (diff_content_changed): Mark path as visited if diffed by external tool. Fixes duplicate occurrences of Index: lines. Patch

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

2012-09-04 Thread stsp
Author: stsp Date: Tue Sep 4 15:55:16 2012 New Revision: 1380703 URL: http://svn.apache.org/viewvc?rev=1380703view=rev Log: * STATUS: Nominate r1380697. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1381150 - /subversion/site/publish/faq.html

2012-09-05 Thread stsp
Author: stsp Date: Wed Sep 5 12:06:14 2012 New Revision: 1381150 URL: http://svn.apache.org/viewvc?rev=1381150view=rev Log: * publish/faq.html (removal): Document the svnsync history filtering trick. Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL

svn commit: r1381151 - /subversion/site/publish/faq.html

2012-09-05 Thread stsp
Author: stsp Date: Wed Sep 5 12:10:00 2012 New Revision: 1381151 URL: http://svn.apache.org/viewvc?rev=1381151view=rev Log: * publish/faq.html: fix typos (commuity - community) Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org

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

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 12:30:00 2012 New Revision: 1382794 URL: http://svn.apache.org/viewvc?rev=1382794view=rev Log: * STATUS (for 1.6.x): Vote for issue #4184 fix. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org

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

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 12:32:27 2012 New Revision: 1382797 URL: http://svn.apache.org/viewvc?rev=1382797view=rev Log: * STATUS (for 1.6.x): Veto non-critical backport nomination. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http

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

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 12:35:56 2012 New Revision: 1382798 URL: http://svn.apache.org/viewvc?rev=1382798view=rev Log: * STATUS (for 1.6.x): Demote another non-critical fix (-0 only since I am not a serf expert). Modified: subversion/branches/1.6.x/STATUS Modified: subversion

svn commit: r1382821 - in /subversion/branches/1.6.x: ./ STATUS subversion/mod_dav_svn/mirror.c

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 13:18:15 2012 New Revision: 1382821 URL: http://svn.apache.org/viewvc?rev=1382821view=rev Log: Merge r1088602 from trunk, resolving tree-conflict on dav-mirror-autocheck.sh. * r1088602 Fix regression introduced in r1104127. That revision introduced a bug where

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

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 13:24:51 2012 New Revision: 1382825 URL: http://svn.apache.org/viewvc?rev=1382825view=rev Log: * STATUS: Remove r1339154 from issue #4184 group because it conflicts. +1 from cmpilato via IRC, philip never explicitly +1'd r1339154. Modified: subversion

svn commit: r1382827 - in /subversion/branches/1.6.x: ./ STATUS subversion/libsvn_repos/replay.c

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 13:28:22 2012 New Revision: 1382827 URL: http://svn.apache.org/viewvc?rev=1382827view=rev Log: Merge r1338810 and r1339164 from trunk. * r1338810, r1339164 Fix issue #4184 (partial svnsync drops properties when converting copies to adds). Justification

svn commit: r1382843 - /subversion/trunk/CHANGES

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 13:49:44 2012 New Revision: 1382843 URL: http://svn.apache.org/viewvc?rev=1382843view=rev Log: * CHANGES: List 1.6.19 changes. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev

svn commit: r1382847 - /subversion/branches/1.6.x/CHANGES

2012-09-10 Thread stsp
Author: stsp Date: Mon Sep 10 13:52:20 2012 New Revision: 1382847 URL: http://svn.apache.org/viewvc?rev=1382847view=rev Log: * CHANGES (for 1.6.x): Sync with trunk. Modified: subversion/branches/1.6.x/CHANGES (contents, props changed) Modified: subversion/branches/1.6.x/CHANGES URL: http

svn commit: r1383328 - /subversion/branches/1.6.x-testsuite-apr-hash-order/

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 09:54:36 2012 New Revision: 1383328 URL: http://svn.apache.org/viewvc?rev=1383328view=rev Log: Create a new branch '1.6.x-testsuite-apr-hash-order' to fix problems with APR-1.4.6 compatibility in the 1.6.x test suite. Added: subversion/branches/1.6.x-testsuite

svn commit: r1383334 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 10:03:11 2012 New Revision: 1383334 URL: http://svn.apache.org/viewvc?rev=1383334view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge the following revisions from trunk, resolving conflicts: r1240619, r1241626, r1291429, r1291446, r1291520, r1291680

svn commit: r1383338 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svntest/actions.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 10:31:12 2012 New Revision: 1383338 URL: http://svn.apache.org/viewvc?rev=1383338view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge r1291941 from trunk. Allows the following tests to pass reliably with APR-1.4.6: stat_tests.py 17: status output in XML

svn commit: r1383353 - /subversion/trunk/subversion/svn/file-merge.c

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 11:06:47 2012 New Revision: 1383353 URL: http://svn.apache.org/viewvc?rev=1383353view=rev Log: * subversion/svn/file-merge.c (svn_cl__merge_file): Preserve executable bit of the merged file. Modified: subversion/trunk/subversion/svn/file-merge.c Modified

svn commit: r1383371 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svntest/verify.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 12:07:53 2012 New Revision: 1383371 URL: http://svn.apache.org/viewvc?rev=1383371view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge r1292507 from trunk. Allows the svnsync tests to pass reliably with APR-1.4.6. Conflict resolution was trivial, expect

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

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 12:15:06 2012 New Revision: 1383374 URL: http://svn.apache.org/viewvc?rev=1383374view=rev Log: * STATUS: Nominate issue #4134 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc

svn commit: r1383376 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/svntest/verify.py subversion/tests/cmdline/update_test

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 12:25:02 2012 New Revision: 1383376 URL: http://svn.apache.org/viewvc?rev=1383376view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge r1292516, r1292768, and r1292926 from trunk (clean merge). Modified: subversion/branches/1.6.x-testsuite-apr-hash

svn commit: r1383382 - /subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 12:43:33 2012 New Revision: 1383382 URL: http://svn.apache.org/viewvc?rev=1383382view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, allow lock_tests.py to run. Follow-up to r1383376. * subversion/tests/cmdline/lock_tests.py (unlock_already_unlocked_files

svn commit: r1383390 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/bindings/swig/python/tests/repository.py subversion/bindings/swig/python/tests/trac/versioncontrol/tests/sv

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 12:56:43 2012 New Revision: 1383390 URL: http://svn.apache.org/viewvc?rev=1383390view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge the following revisions from trunk: r1292255, r1292260, r1292296, and r1292322 (clean merge). Allows the swig-py tests

svn commit: r1383395 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/bindings/swig/python/tests/wc.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 13:01:44 2012 New Revision: 1383395 URL: http://svn.apache.org/viewvc?rev=1383395view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge r1292248 from trunk. Another swig-py tests fix for APR 1.4.6 Modified: subversion/branches/1.6.x-testsuite-apr-hash

svn commit: r1383396 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 13:13:37 2012 New Revision: 1383396 URL: http://svn.apache.org/viewvc?rev=1383396view=rev Log: * tools/dev/unix-build/Makefile.svn: Restore ability to run swig-rb and swig-pl tests on OpenBSD-current. Modified: subversion/trunk/tools/dev/unix-build

svn commit: r1383398 - in /subversion/branches/1.6.x-testsuite-apr-hash-order: ./ subversion/bindings/swig/ruby/test/test_client.rb subversion/bindings/swig/ruby/test/test_wc.rb

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 13:14:56 2012 New Revision: 1383398 URL: http://svn.apache.org/viewvc?rev=1383398view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, merge r1310535 and r1310594 from trunk. Fixes swig-rb tests to run with APR 1.4.6 Modified: subversion/branches/1.6.x

svn commit: r1383408 - /subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svnadmin_tests.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 13:30:57 2012 New Revision: 1383408 URL: http://svn.apache.org/viewvc?rev=1383408view=rev Log: On the 1.6.x-testsuite-apr-hash-order branch, allow the svnadmin test 8 to pass with APR 1.4.6 (svnadmin_tests.py 8: 'svnadmin hotcopy PATH .'). * subversion/tests/cmdline

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

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 13:41:37 2012 New Revision: 1383414 URL: http://svn.apache.org/viewvc?rev=1383414view=rev Log: * STATUS (for 1.6.x): Nominate the 1.6.x-testsuite-apr-hash-order branch. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL

svn commit: r1383466 - /subversion/trunk/CHANGES

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 16:11:05 2012 New Revision: 1383466 URL: http://svn.apache.org/viewvc?rev=1383466view=rev Log: * CHANGES: Fix spacing. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev

svn commit: r1383480 - in /subversion/trunk/subversion: svn/cl.h svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout tests/cmdline/log_tests.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 16:58:40 2012 New Revision: 1383480 URL: http://svn.apache.org/viewvc?rev=1383480view=rev Log: Allow mulitple --search options with 'svn log'. Log messages are shown if they match any of the provided search patterns (i.e. logical OR). This will be extended later

svn propchange: r1383480 - svn:log

2012-09-11 Thread stsp
Author: stsp Revision: 1383480 Modified property: svn:log Modified: svn:log at Tue Sep 11 18:24:37 2012 -- --- svn:log (original) +++ svn:log Tue Sep 11 18:24:37 2012 @@ -1,4 +1,4 @@ -Allow mulitple --search options

svn commit: r1383518 - in /subversion/trunk/subversion: svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout tests/cmdline/log_tests.py

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 18:35:51 2012 New Revision: 1383518 URL: http://svn.apache.org/viewvc?rev=1383518view=rev Log: Add a new --search-and option to allow combination of search patterns. Combined search patterns match in union (i.e. logical AND). Suggested by: philip * subversion/svn

svn commit: r1383532 - /subversion/trunk/CHANGES

2012-09-11 Thread stsp
Author: stsp Date: Tue Sep 11 18:42:16 2012 New Revision: 1383532 URL: http://svn.apache.org/viewvc?rev=1383532view=rev Log: * CHANGES: List new --search-and and --isearch-and options for 1.8. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org

svn commit: r1383925 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:18:54 2012 New Revision: 1383925 URL: http://svn.apache.org/viewvc?rev=1383925view=rev Log: * subversion/svn/main.c (svn_cl__options): Try to use less misleading wording in the 'svn help log' description of the --search-and option (the previous/combined

svn commit: r1383927 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:25:13 2012 New Revision: 1383927 URL: http://svn.apache.org/viewvc?rev=1383927view=rev Log: * subversion/svn/main.c (svn_cl__options): Shorten descriptions of the --search and --search-and options to fit on a single line. The information removed is already

svn commit: r1383931 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:29:36 2012 New Revision: 1383931 URL: http://svn.apache.org/viewvc?rev=1383931view=rev Log: * subversion/svn/main.c (svn_cl__cmd_table): In 'svn help log', show actual characters, rather than dots, to illustrate use of the [] glob wildcard. * subversion

svn commit: r1383936 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:42:16 2012 New Revision: 1383936 URL: http://svn.apache.org/viewvc?rev=1383936view=rev Log: * subversion/svn/main.c (svn_cl__cmd_table): Clarify that any of author, date, log message text, or searched path can match, rather than all of them. Also put quotes

svn commit: r1383941 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:48:46 2012 New Revision: 1383941 URL: http://svn.apache.org/viewvc?rev=1383941view=rev Log: * subversion/svn/main.c (svn_cl__cmd_table): In 'svn help log', point out that --search does not search the log message text if --quiet is used. * subversion/tests

svn commit: r1383943 - in /subversion/branches/1.6.x: ./ subversion/bindings/swig/python/tests/ subversion/bindings/swig/python/tests/trac/versioncontrol/tests/ subversion/bindings/swig/ruby/test/ sub

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:57:35 2012 New Revision: 1383943 URL: http://svn.apache.org/viewvc?rev=1383943view=rev Log: Reintegrate the 1.6.x-testsuite-apr-hash-order branch. Affects test suite only, thus using the somewhat looser voting system. * ^/subversion/branches/1.6.x-testsuite-apr

svn commit: r1383944 - /subversion/branches/1.6.x-testsuite-apr-hash-order/

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 13:58:44 2012 New Revision: 1383944 URL: http://svn.apache.org/viewvc?rev=1383944view=rev Log: Remove the 1.6.x-testsuite-apr-hash-order branch, reintegrated in r1383943. Removed: subversion/branches/1.6.x-testsuite-apr-hash-order/

svn commit: r1383946 - /subversion/trunk/CHANGES

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 14:00:48 2012 New Revision: 1383946 URL: http://svn.apache.org/viewvc?rev=1383946view=rev Log: * CHANGES: List test suite fixes for 1.6.19. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk

svn commit: r1383947 - /subversion/branches/1.6.x/CHANGES

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 14:02:42 2012 New Revision: 1383947 URL: http://svn.apache.org/viewvc?rev=1383947view=rev Log: * CHANGES (1.6.x): Sync with trunk. Modified: subversion/branches/1.6.x/CHANGES (contents, props changed) Modified: subversion/branches/1.6.x/CHANGES URL: http

svn commit: r1383960 - /subversion/trunk/tools/dist/make-deps-tarball.sh

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 14:19:42 2012 New Revision: 1383960 URL: http://svn.apache.org/viewvc?rev=1383960view=rev Log: * tools/dist/make-deps-tarball.sh: Update dependencies for 1.6.19. Modified: subversion/trunk/tools/dist/make-deps-tarball.sh Modified: subversion/trunk/tools/dist

svn commit: r1383986 - in /subversion/tags/1.6.19: ./ subversion/include/svn_version.h

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 14:53:11 2012 New Revision: 1383986 URL: http://svn.apache.org/viewvc?rev=1383986view=rev Log: Tagging release 1.6.19 Added: subversion/tags/1.6.19/ - copied from r1383947, subversion/branches/1.6.x/ Modified: subversion/tags/1.6.19/subversion/include

svn commit: r1383988 - in /subversion/branches/1.6.x: STATUS subversion/include/svn_version.h

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 14:55:47 2012 New Revision: 1383988 URL: http://svn.apache.org/viewvc?rev=1383988view=rev Log: On the 1.6.x branch: * subversion/include/svn_version.h, STATUS: Bump patch level to 20. 1.6.19 has been tagged. Modified: subversion/branches/1.6.x/STATUS

svn commit: r846 - /dev/subversion/

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 15:05:20 2012 New Revision: 846 Log: Add 1.6.19 candidate release artifacts Added: dev/subversion/subversion-1.6.19.tar.bz2 (with props) dev/subversion/subversion-1.6.19.tar.bz2.asc (with props) dev/subversion/subversion-1.6.19.tar.bz2.sha1 dev

svn commit: r1384062 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-09-12 Thread stsp
Author: stsp Date: Wed Sep 12 17:59:26 2012 New Revision: 1384062 URL: http://svn.apache.org/viewvc?rev=1384062view=rev Log: * tools/dev/unix-build/Makefile.svn: Fix running javahl tests on non-trunk. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk

svn commit: r1386593 - /subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 13:00:48 2012 New Revision: 1386593 URL: http://svn.apache.org/viewvc?rev=1386593view=rev Log: * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (password_set_gnome_keyring, password_set_gnome_keyring): Don't bother figuring out the name of the default

svn commit: r1386594 - /subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 13:06:14 2012 New Revision: 1386594 URL: http://svn.apache.org/viewvc?rev=1386594view=rev Log: * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (get_default_keyring_name): The (currently single) caller of this function forgot to free the result string

svn commit: r1386601 - /subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 13:15:53 2012 New Revision: 1386601 URL: http://svn.apache.org/viewvc?rev=1386601view=rev Log: Follow-up to r1386594: * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (): Include apr_strings.h for apr_pstrdup() declaration. Modified: subversion/trunk

svn commit: r1386632 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 14:32:00 2012 New Revision: 1386632 URL: http://svn.apache.org/viewvc?rev=1386632view=rev Log: * tools/dist/unix-build/Makefile.svn: Compile with gnome-keyring support if gnome-keyring libraries can be found. Modified: subversion/trunk/tools/dev/unix-build

svn commit: r1386645 - /subversion/site/publish/roadmap.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 14:59:24 2012 New Revision: 1386645 URL: http://svn.apache.org/viewvc?rev=1386645view=rev Log: * publish/roadmap.html (next-release-status): Mark local moves item as in-progress again, and link to issue #4232 which is a release blocker. Modified: subversion

svn commit: r1386654 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 15:19:14 2012 New Revision: 1386654 URL: http://svn.apache.org/viewvc?rev=1386654view=rev Log: * publish/docs/release-notes/1.8.html: Document 'svn diff' enhancements. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site

svn commit: r1386673 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 15:53:54 2012 New Revision: 1386673 URL: http://svn.apache.org/viewvc?rev=1386673view=rev Log: * publish/docs/release-notes/1.8.html: Mention 'svn log --search'. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site/publish

svn commit: r1386676 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 15:55:13 2012 New Revision: 1386676 URL: http://svn.apache.org/viewvc?rev=1386676view=rev Log: * publish/docs/release-notes/1.8.html: Missing p from previous commit. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site/publish

svn commit: r1386679 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 15:57:53 2012 New Revision: 1386679 URL: http://svn.apache.org/viewvc?rev=1386679view=rev Log: * publish/docs/release-notes/1.8.html (svn-diff): Wrap example invocations in a pre tag. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified

svn commit: r1386680 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 16:01:03 2012 New Revision: 1386680 URL: http://svn.apache.org/viewvc?rev=1386680view=rev Log: * publish/docs/release-notes/1.8.html (svn-diff): Show proper example diff output. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified

svn commit: r1386684 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 16:03:33 2012 New Revision: 1386684 URL: http://svn.apache.org/viewvc?rev=1386684view=rev Log: * publish/docs/release-notes/1.8.html (svn-log-search): Put $ in front of 'svn log' invocation examples for consistency with other sections. Modified: subversion

svn commit: r1386696 - /subversion/trunk/configure.ac

2012-09-17 Thread stsp
Author: stsp Date: Mon Sep 17 16:29:25 2012 New Revision: 1386696 URL: http://svn.apache.org/viewvc?rev=1386696view=rev Log: * configure.ac: Don't raise a fatal error if --with-gnome-kerying was passed but the necessary things can't be found. Just print a warning and move on without

svn propchange: r1386696 - svn:log

2012-09-17 Thread stsp
Author: stsp Revision: 1386696 Modified property: svn:log Modified: svn:log at Mon Sep 17 16:33:10 2012 -- --- svn:log (original) +++ svn:log Mon Sep 17 16:33:10 2012 @@ -1,3 +1,3 @@ -* configure.ac: Don't raise a fatal

svn commit: r1387026 - /subversion/trunk/subversion/libsvn_subr/gpg_agent.c

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 07:52:49 2012 New Revision: 1387026 URL: http://svn.apache.org/viewvc?rev=1387026view=rev Log: * subversion/libsvn_subr/gpg_agent.c (receive_from_gpg_agent): Fix typo in comment. Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c Modified

svn commit: r1387034 - /subversion/trunk/configure.ac

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 08:04:52 2012 New Revision: 1387034 URL: http://svn.apache.org/viewvc?rev=1387034view=rev Log: Follow-up to r1386696: * configure.ac: Actually disable GNOME keyring compilation if the necessary things cannot be found. The change in r1386696 made us print

svn commit: r1387070 - /subversion/trunk/configure.ac

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 09:28:09 2012 New Revision: 1387070 URL: http://svn.apache.org/viewvc?rev=1387070view=rev Log: * configure.ac: Don't require shared library support for the GPG-Agent password cache. Support for GPG-Agent is implemented directly in libsvn_subr, not in a shared

svn commit: r1387071 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 09:34:17 2012 New Revision: 1387071 URL: http://svn.apache.org/viewvc?rev=1387071view=rev Log: * publish/docs/release-notes/1.8.html: Tidy up gpg-agent release notes section, and refer readers to the official gpg-agent documentation. Modified: subversion/site

svn commit: r1387081 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 10:14:40 2012 New Revision: 1387081 URL: http://svn.apache.org/viewvc?rev=1387081view=rev Log: * publish/docs/release-notes/1.8.html: Mention hook script environment configuration support and UTF-8 support in mod_dav_svn. Modified: subversion/site/publish

svn commit: r1387086 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 10:43:17 2012 New Revision: 1387086 URL: http://svn.apache.org/viewvc?rev=1387086view=rev Log: * publish/docs/release-notes/1.8.html: Remove a 'TODO' that pertains to code behaviour. 1.8.html is not an issue tracker. Modified: subversion/site/publish/docs

svn commit: r1387090 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:18:19 2012 New Revision: 1387090 URL: http://svn.apache.org/viewvc?rev=1387090view=rev Log: 8 publish/docs/release-notes/1.8.html: Document Julian's awesome feature! Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site

svn commit: r1387091 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:20:51 2012 New Revision: 1387091 URL: http://svn.apache.org/viewvc?rev=1387091view=rev Log: * publish/docs/release-notes/1.8.html: Try to improve spacing. Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site/publish/docs

svn commit: r1387092 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:21:39 2012 New Revision: 1387092 URL: http://svn.apache.org/viewvc?rev=1387092view=rev Log: * publish/docs/release-notes/1.8.html (auto-merge): typo Modified: subversion/site/publish/docs/release-notes/1.8.html Modified: subversion/site/publish/docs

svn propchange: r1387091 - svn:log

2012-09-18 Thread stsp
Author: stsp Revision: 1387091 Modified property: svn:log Modified: svn:log at Tue Sep 18 11:22:07 2012 -- --- svn:log (original) +++ svn:log Tue Sep 18 11:22:07 2012 @@ -1 +1,2 @@ -* publish/docs/release-notes/1.8.html

svn commit: r1387094 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:29:00 2012 New Revision: 1387094 URL: http://svn.apache.org/viewvc?rev=1387094view=rev Log: * publish/docs/release-notes/1.8.html: Mention automatic merge and ra_neon removal at the top of the page. Add automatic merge to the compat matrix. Modified

svn commit: r1387095 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:35:18 2012 New Revision: 1387095 URL: http://svn.apache.org/viewvc?rev=1387095view=rev Log: * publish/docs/release-notes/1.8.html: Use more user-friendly wording in section about neon removal. Users shouldn't care what ra_neon stands for. Modified

svn commit: r1387096 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:36:21 2012 New Revision: 1387096 URL: http://svn.apache.org/viewvc?rev=1387096view=rev Log: * publish/docs/release-notes/1.8.html: Seems that serf, like neon, is always spelt in lower case... Modified: subversion/site/publish/docs/release-notes/1.8.html

svn commit: r1387101 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:52:00 2012 New Revision: 1387101 URL: http://svn.apache.org/viewvc?rev=1387101view=rev Log: * publish/docs/release-notes/1.8.html: Document that pristine data is now downloaded only once. Modified: subversion/site/publish/docs/release-notes/1.8.html

svn commit: r1387102 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 11:58:10 2012 New Revision: 1387102 URL: http://svn.apache.org/viewvc?rev=1387102view=rev Log: * publish/docs/release-notes/1.8.html (swig-py-star): Move to compatibility section since it describes an incompatible change. Also drop link to viewvc, we shouldn't

svn commit: r1387103 - /subversion/site/publish/docs/release-notes/1.8.html

2012-09-18 Thread stsp
Author: stsp Date: Tue Sep 18 12:00:59 2012 New Revision: 1387103 URL: http://svn.apache.org/viewvc?rev=1387103view=rev Log: * publish/docs/release-notes/1.8.html: It's not libsvn_wc APIs which had errata in this release. Modified: subversion/site/publish/docs/release-notes/1.8.html

<    4   5   6   7   8   9   10   11   12   13   >