svn commit: r1195873 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/client.h libsvn_client/delete.c libsvn_wc/adm_ops.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 08:46:25 2011 New Revision: 1195873 URL: http://svn.apache.org/viewvc?rev=1195873view=rev Log: Allow deletion of multiple, potentially non-nested, targets from a working copy within a single sqlite transaction. Should improve performance of 'svn rm dir/*', especially

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

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 12:29:09 2011 New Revision: 1195958 URL: http://svn.apache.org/viewvc?rev=1195958view=rev Log: * site/publish/packages.html: De-list AIX binaries for Subversion 1.4.6. Subversion 1.4.x is unsupported so we shouldn't be directing people at binaries

svn commit: r1196014 - /subversion/branches/1.7.x-r1195873/

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 14:32:04 2011 New Revision: 1196014 URL: http://svn.apache.org/viewvc?rev=1196014view=rev Log: Create a 1.7.x backport branch for r1195873. Added: subversion/branches/1.7.x-r1195873/ (props changed) - copied from r1196012, subversion/branches/1.7.x

svn commit: r1196018 - in /subversion/branches/1.7.x-r1195873: ./ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_wc/

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 14:33:10 2011 New Revision: 1196018 URL: http://svn.apache.org/viewvc?rev=1196018view=rev Log: On the 1.7.x-r1196014 branch, merge r1196014 from trunk, resolving conflicts. Modified: subversion/branches/1.7.x-r1195873/ (props changed) subversion/branches

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

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 17:12:47 2011 New Revision: 1196149 URL: http://svn.apache.org/viewvc?rev=1196149view=rev Log: * subversion/libsvn_wc/wc-queries.sql (STMT_INSERT_DELETE_LIST): Use the NODES_CURRENT view instead of manually filtering by MAX(op_depth). Modified: subversion

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

2011-11-01 Thread stsp
Author: stsp Date: Tue Nov 1 18:26:54 2011 New Revision: 1196191 URL: http://svn.apache.org/viewvc?rev=1196191view=rev Log: During 'svn rm', sort the delete-list in C, rather than in SQL. This speeds up 'svn rm dir/*'. Also fix notification in case of cancellation. We were omitting notification

svn commit: r1197135 - /subversion/trunk/subversion/libsvn_client/externals.c

2011-11-03 Thread stsp
Author: stsp Date: Thu Nov 3 14:25:45 2011 New Revision: 1197135 URL: http://svn.apache.org/viewvc?rev=1197135view=rev Log: Follow-up to r1188774: * subversion/libsvn_client/externals.c (svn_client__handle_externals): Try deleting any amount of unversioned directories between the defining

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

2011-11-03 Thread stsp
Author: stsp Date: Thu Nov 3 14:28:15 2011 New Revision: 1197138 URL: http://svn.apache.org/viewvc?rev=1197138view=rev Log: * STATUS: Add r1197135 to r1188774 nomination. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org

svn commit: r1197998 - in /subversion/trunk/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2011-11-05 Thread stsp
Author: stsp Date: Sat Nov 5 17:54:31 2011 New Revision: 1197998 URL: http://svn.apache.org/viewvc?rev=1197998view=rev Log: Make 'svn patch' ignore /dev/null patch target paths to improve compatibility with patches generated by git. Git uses /dev/null as the old name for newly added targets

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

2011-11-05 Thread stsp
Author: stsp Date: Sat Nov 5 17:56:50 2011 New Revision: 1197999 URL: http://svn.apache.org/viewvc?rev=1197999view=rev Log: * STATUS: Propose r1197998. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1199357 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_client/update.c libsvn_wc/deprecated.c libsvn_wc/update_editor.c

2011-11-08 Thread stsp
Author: stsp Date: Tue Nov 8 17:39:23 2011 New Revision: 1199357 URL: http://svn.apache.org/viewvc?rev=1199357view=rev Log: On the moves-scan-log branch, rev svn_wc_get_update_editor(), adding a callback the wc library can use to ask for information about server-side moves. This way we can avoid

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

2011-11-10 Thread stsp
Author: stsp Date: Thu Nov 10 11:56:54 2011 New Revision: 1200282 URL: http://svn.apache.org/viewvc?rev=1200282view=rev Log: * site/publish/packages.html: Explain how to install mod_dav_svn from Debian and Ubuntu packages. Modified: subversion/site/publish/packages.html Modified

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

2011-11-10 Thread stsp
Author: stsp Date: Thu Nov 10 11:59:43 2011 New Revision: 1200284 URL: http://svn.apache.org/viewvc?rev=1200284view=rev Log: * publish/packages.html: Fix stray text accidentally committed in r1200282. Modified: subversion/site/publish/packages.html Modified: subversion/site/publish

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

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 12:41:05 2011 New Revision: 1200855 URL: http://svn.apache.org/viewvc?rev=1200855view=rev Log: * STATUS: Ack r1199950. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches

svn commit: r1200873 - /subversion/site/publish/security/index.html

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 13:25:45 2011 New Revision: 1200873 URL: http://svn.apache.org/viewvc?rev=1200873view=rev Log: * publish/security/index.html (CVE-2011-1783): Align vulnerable server versions listed on this page with the ones given in the advisory. 1.6.16 wasn't listed

svn commit: r1200897 - /subversion/trunk/CHANGES

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 14:24:48 2011 New Revision: 1200897 URL: http://svn.apache.org/viewvc?rev=1200897view=rev Log: * CHANGES: Note which revision fixed CVE-2011-1921 and CVE-2011-1783. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http

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

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 14:27:11 2011 New Revision: 1200899 URL: http://svn.apache.org/viewvc?rev=1200899view=rev Log: * CHANGES (for 1.6.x): Sync with CHANGES from trunk. Modified: subversion/branches/1.6.x/CHANGES (contents, props changed) Modified: subversion/branches/1.6.x

svn commit: r1200900 - /subversion/branches/1.7.x/CHANGES

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 14:28:58 2011 New Revision: 1200900 URL: http://svn.apache.org/viewvc?rev=1200900view=rev Log: * CHANGES (for 1.7.x): Sync with trunk. Modified: subversion/branches/1.7.x/CHANGES (contents, props changed) Modified: subversion/branches/1.7.x/CHANGES URL: http

svn commit: r1200923 - /subversion/branches/moves-scan-log/BRANCH-README

2011-11-11 Thread stsp
Author: stsp Date: Fri Nov 11 16:01:27 2011 New Revision: 1200923 URL: http://svn.apache.org/viewvc?rev=1200923view=rev Log: On the moves-scan-log branch, add a minimal branch-readme file. * BRANCH-README: New. To be extended later. Added: subversion/branches/moves-scan-log/BRANCH-README

svn commit: r1200926 [3/12] - in /subversion/branches/moves-scan-log: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ notes/ subversion/b

2011-11-11 Thread stsp
Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/externals.c URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/externals.c?rev=1200926r1=1200925r2=1200926view=diff

svn commit: r1200926 [8/12] - in /subversion/branches/moves-scan-log: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ notes/ subversion/b

2011-11-11 Thread stsp
Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c?rev=1200926r1=1200925r2=1200926view=diff

svn commit: r1200926 [12/12] - in /subversion/branches/moves-scan-log: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ notes/ subversion/

2011-11-11 Thread stsp
Modified: subversion/branches/moves-scan-log/subversion/tests/libsvn_subr/mergeinfo-test.c URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1200926r1=1200925r2=1200926view=diff

svn commit: r1201824 - in /subversion/trunk/subversion: libsvn_client/diff.c libsvn_ra/ra_loader.c tests/cmdline/diff_tests.py

2011-11-14 Thread stsp
Author: stsp Date: Mon Nov 14 18:59:06 2011 New Revision: 1201824 URL: http://svn.apache.org/viewvc?rev=1201824view=rev Log: Fix issue #2873, svn diff -c N on a file added in revision N does not create patch. When adding a file in rN and trying to diff this file in the range -rN-1:N, a client

svn commit: r1202121 - /subversion/branches/1.7.x-r1201824/

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 10:51:44 2011 New Revision: 1202121 URL: http://svn.apache.org/viewvc?rev=1202121view=rev Log: Create a backport branch for r1201824. Added: subversion/branches/1.7.x-r1201824/ (props changed) - copied from r1202119, subversion/branches/1.7.x

svn commit: r1202126 - in /subversion/branches/1.7.x-r1201824: ./ subversion/libsvn_client/diff.c subversion/libsvn_ra/ra_loader.c subversion/tests/cmdline/diff_tests.py

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 11:02:02 2011 New Revision: 1202126 URL: http://svn.apache.org/viewvc?rev=1202126view=rev Log: On the 1.7.x-r1201824 branch, backport r1201824 from trunk, resolving conflicts. Modified: subversion/branches/1.7.x-r1201824/ (props changed) subversion

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 11:07:28 2011 New Revision: 1202129 URL: http://svn.apache.org/viewvc?rev=1202129view=rev Log: * STATUS: Suggest r1201824. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1202132 - /subversion/trunk/subversion/svn/log-cmd.c

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 11:25:43 2011 New Revision: 1202132 URL: http://svn.apache.org/viewvc?rev=1202132view=rev Log: * subversion/svn/log-cmd.c (log_entry_receiver): Now that issue #2873 has been fixed, remove a corresponding workaround for 'svn log --diff'. The diff displayed is now

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 11:44:31 2011 New Revision: 1202138 URL: http://svn.apache.org/viewvc?rev=1202138view=rev Log: * STATUS: Vote for r1202135. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 16:13:19 2011 New Revision: 1202272 URL: http://svn.apache.org/viewvc?rev=1202272view=rev Log: * STATUS (for 1.6.x): Nominate r893478. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org/viewvc

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 16:16:05 2011 New Revision: 1202275 URL: http://svn.apache.org/viewvc?rev=1202275view=rev Log: * STATUS (for 1.6.x): r893478 approved by cmpilato and danielsh on IRC Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 18:10:02 2011 New Revision: 1202345 URL: http://svn.apache.org/viewvc?rev=1202345view=rev Log: * STATUS: Approve r1202135 group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-15 Thread stsp
Author: stsp Date: Tue Nov 15 18:18:00 2011 New Revision: 1202352 URL: http://svn.apache.org/viewvc?rev=1202352view=rev Log: * STATUS: Approve r1201002. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 13:08:51 2011 New Revision: 1202692 URL: http://svn.apache.org/viewvc?rev=1202692view=rev Log: * STATUS: I like r1202630. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 18:58:09 2011 New Revision: 1202836 URL: http://svn.apache.org/viewvc?rev=1202836view=rev Log: * STATUS: Approve r1202807. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1202883 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_client/update.c libsvn_wc/util.c svn/notify.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 21:03:56 2011 New Revision: 1202883 URL: http://svn.apache.org/viewvc?rev=1202883view=rev Log: On the moves-scan-log branch, do progress reporting while scanning for moves. It currently looks as follows: $ svn up -r 1083285 Updating '.': Scanning revision log

svn commit: r1202884 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 21:05:46 2011 New Revision: 1202884 URL: http://svn.apache.org/viewvc?rev=1202884view=rev Log: On the moves-scan-log branch: * subversion/libsvn_client/update.c (scan_moves_log_receiver): Do nothing if no changed path data is available for the revision (e.g

svn commit: r1202911 - /subversion/branches/moves-scan-log/subversion/svn/notify.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 22:24:51 2011 New Revision: 1202911 URL: http://svn.apache.org/viewvc?rev=1202911view=rev Log: On the moves-scan-log branch: * subversion/svn/notify.c (notify): Prepend \r to the line printed when scanning stops. Modified: subversion/branches/moves-scan-log

svn commit: r1202949 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-16 Thread stsp
Author: stsp Date: Thu Nov 17 00:24:48 2011 New Revision: 1202949 URL: http://svn.apache.org/viewvc?rev=1202949view=rev Log: On the moves-scan-log branch, implement an ancestry check between the deleted and copied node in the move detection heuristic. * subversion/libsvn_client/update.c

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

2011-11-18 Thread stsp
Author: stsp Date: Fri Nov 18 13:09:17 2011 New Revision: 1203633 URL: http://svn.apache.org/viewvc?rev=1203633view=rev Log: * STATUS: Approve r1203546. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-18 Thread stsp
Author: stsp Date: Fri Nov 18 14:16:08 2011 New Revision: 1203653 URL: http://svn.apache.org/viewvc?rev=1203653view=rev Log: Follow-up to r1203651: * subversion/mod_dav_svn/mod_dav_svn.c (merge_dir_config): Use svn__fspath instead of svn_dirent for URL-paths. Correctly print Locations

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

2011-11-18 Thread stsp
Author: stsp Date: Fri Nov 18 14:16:53 2011 New Revision: 1203656 URL: http://svn.apache.org/viewvc?rev=1203656view=rev Log: * STATUS: Add r1203653. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches

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

2011-11-18 Thread stsp
Author: stsp Date: Fri Nov 18 14:21:09 2011 New Revision: 1203659 URL: http://svn.apache.org/viewvc?rev=1203659view=rev Log: Follow-up to 1203653: * subversion/mod_dav_svn/mod_dav_svn.c (merge_dir_config): Use svn__urlpath instead of svn__fspath for URL-paths. This is a cosmetic change

svn commit: r1204035 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_client/update.c

2011-11-19 Thread stsp
Author: stsp Date: Sat Nov 19 18:34:52 2011 New Revision: 1204035 URL: http://svn.apache.org/viewvc?rev=1204035view=rev Log: On the moves-scan-log branch, change the way data about server-side moves is returned from the log history scanner. Before this change, a given sequence of moves which

svn propchange: r1204035 - svn:log

2011-11-19 Thread stsp
Author: stsp Revision: 1204035 Modified property: svn:log Modified: svn:log at Sat Nov 19 18:37:34 2011 -- --- svn:log (original) +++ svn:log Sat Nov 19 18:37:34 2011 @@ -32,7 +32,7 @@ This can be visualized as follows

svn commit: r1204040 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-19 Thread stsp
Author: stsp Date: Sat Nov 19 18:44:18 2011 New Revision: 1204040 URL: http://svn.apache.org/viewvc?rev=1204040view=rev Log: On the moves-scan-log branch: * subversion/libsvn_client/update.c (get_repos_moves): Print move copyfrom revision in debug output. Modified: subversion/branches

svn commit: r1204167 - /subversion/trunk/subversion/libsvn_subr/io.c

2011-11-20 Thread stsp
Author: stsp Date: Sun Nov 20 13:35:00 2011 New Revision: 1204167 URL: http://svn.apache.org/viewvc?rev=1204167view=rev Log: Fix issue #4064, UTF-8 files containing only a byte order mark are added as binary. Special-case empty UTF-8 files which have a UTF-8 BOM. This prevents such files from

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

2011-11-20 Thread stsp
Author: stsp Date: Sun Nov 20 13:37:36 2011 New Revision: 1204168 URL: http://svn.apache.org/viewvc?rev=1204168view=rev Log: * STATUS: Nominate r1204167. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1204445 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-21 Thread stsp
Author: stsp Date: Mon Nov 21 11:11:25 2011 New Revision: 1204445 URL: http://svn.apache.org/viewvc?rev=1204445view=rev Log: On the moves-scan-log branch: * subversion/libsvn_client/update.c (scan_moves_log_receiver_baton): Explain the 'moves' hash in detail, based on the log message

svn commit: r1205193 - /subversion/trunk/subversion/libsvn_client/commit.c

2011-11-22 Thread stsp
Author: stsp Date: Tue Nov 22 22:18:37 2011 New Revision: 1205193 URL: http://svn.apache.org/viewvc?rev=1205193view=rev Log: Do not throw a fatal error during 'svn import' if a file with inconsistent eol-style has svn:eol-style set to 'native'. Also, improve an error message. For discussion, see

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

2011-11-22 Thread stsp
Author: stsp Date: Tue Nov 22 22:24:53 2011 New Revision: 1205196 URL: http://svn.apache.org/viewvc?rev=1205196view=rev Log: * STATUS: Nominate r1205193. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1205355 [2/2] - in /subversion/branches/moves-scan-log: ./ contrib/client-side/emacs/ notes/ subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_

2011-11-23 Thread stsp
Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/mergeinfo.c?rev=1205355r1=1205354r2=1205355view=diff

svn commit: r1205362 - /subversion/trunk/CHANGES

2011-11-23 Thread stsp
Author: stsp Date: Wed Nov 23 10:53:16 2011 New Revision: 1205362 URL: http://svn.apache.org/viewvc?rev=1205362view=rev Log: * CHANGES: Tweak 1.7.2 section to explain some changes better. Also fix a wrong revision number (r1202603 vs. r1202630) Modified: subversion/trunk/CHANGES Modified

svn commit: r1205528 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_wc/update_editor.c svn/cl.h svn/conflict-callbacks.c svn/main.c

2011-11-23 Thread stsp
Author: stsp Date: Wed Nov 23 18:24:33 2011 New Revision: 1205528 URL: http://svn.apache.org/viewvc?rev=1205528view=rev Log: On the moves-scan-log branch, hook the moves-log scanning logic into to the interactive conflict resolution callback system. For now, this is triggered only on delete vs

svn propchange: r1205528 - svn:log

2011-11-23 Thread stsp
Author: stsp Revision: 1205528 Modified property: svn:log Modified: svn:log at Wed Nov 23 18:25:30 2011 -- --- svn:log (original) +++ svn:log Wed Nov 23 18:25:30 2011 @@ -1,4 +1,4 @@ -On the moves-scan-log branch, hook

svn commit: r1205769 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_client/update.c libsvn_wc/util.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 09:49:51 2011 New Revision: 1205769 URL: http://svn.apache.org/viewvc?rev=1205769view=rev Log: On the moves-scan-log branch, add a constructor for svn_wc_repos_move_info_t. * subversion/include/svn_wc.h (svn_wc_repos_move_info_t): Note that API users should

svn commit: r1205776 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 10:17:39 2011 New Revision: 1205776 URL: http://svn.apache.org/viewvc?rev=1205776view=rev Log: On the moves-scan-log branch, fix detection of applicable moves during update. * subversion/libsvn_wc/update_editor.c (find_applicable_move): Return proper move chains

svn commit: r1205777 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 10:24:28 2011 New Revision: 1205777 URL: http://svn.apache.org/viewvc?rev=1205777view=rev Log: On the moves-scan-log branch, improve the moves prompt. * subversion/svn/conflict-callbacks.c (pick_move): Don't append the revision the move happened in to the move

svn commit: r1205784 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_wc/update_editor.c svn/conflict-callbacks.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 10:51:24 2011 New Revision: 1205784 URL: http://svn.apache.org/viewvc?rev=1205784view=rev Log: On the moves-scan-log branch, fix support for multiple move suggestions. * subversion/include/svn_wc.h (svn_wc_conflict_description2_t): Rename suggested_move

svn commit: r1205798 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 12:08:22 2011 New Revision: 1205798 URL: http://svn.apache.org/viewvc?rev=1205798view=rev Log: On the moves-scan-log branch, eliminate a small bit of code duplication. * subversion/svn/conflict-callbacks.c (svn_cl__conflict_handler): If the user chose to scan

svn commit: r1205829 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 13:54:42 2011 New Revision: 1205829 URL: http://svn.apache.org/viewvc?rev=1205829view=rev Log: On the moves-scan-log branch, fix move-chain construction in the update editor. * subversion/libsvn_wc/update_editor.c (find_applicable_moves): Properly link together

svn commit: r1205832 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 13:57:21 2011 New Revision: 1205832 URL: http://svn.apache.org/viewvc?rev=1205832view=rev Log: On the moves-scan-log branch, show move chains to the user. * subversion/svn/conflict-callbacks.c (format_move_chain_for_display): New helper. (pick_move): Use the new

svn commit: r1205914 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 16:29:11 2011 New Revision: 1205914 URL: http://svn.apache.org/viewvc?rev=1205914view=rev Log: On the moves-scan-log branch, always create the suggested_moves array in tree conflict descriptions, even if it is empty. * subversion/libsvn_wc/update_editor.c

svn commit: r1205923 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 16:39:32 2011 New Revision: 1205923 URL: http://svn.apache.org/viewvc?rev=1205923view=rev Log: On the moves-scan-log branch, rename a conflict prompt option. * subversion/svn/conflict-callbacks.c (svn_cl__conflict_handler): Rename 'suggest-move' to 'find-move

svn commit: r1205924 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 16:40:53 2011 New Revision: 1205924 URL: http://svn.apache.org/viewvc?rev=1205924view=rev Log: On the moves-scan-log branch, remove debugging output. * subversion/libsvn_client/update.c (get_repos_moves): Remove debug output. The same information is now printed

svn commit: r1205931 - in /subversion/branches/moves-scan-log/subversion/svn: cl.h conflict-callbacks.c main.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 17:03:23 2011 New Revision: 1205931 URL: http://svn.apache.org/viewvc?rev=1205931view=rev Log: On the moves-scan-log branch, improve output of the conflict callback. * subversion/svn/cl.h (svn_cl__conflict_baton_t): Add path_prefix, to allow showing relative

svn commit: r1205936 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 17:16:46 2011 New Revision: 1205936 URL: http://svn.apache.org/viewvc?rev=1205936view=rev Log: On the moves-scan-log branch, correctly label the local state of tree conflicts involving a locally moved-away node. * subversion/libsvn_wc/update_editor.c

svn commit: r1205967 - in /subversion/branches/moves-scan-log: ./ CHANGES subversion/libsvn_client/merge.c subversion/libsvn_fs_base/bdb/locks-table.c subversion/libsvn_fs_base/reps-strings.c subversi

2011-11-24 Thread stsp
Author: stsp Date: Thu Nov 24 19:55:12 2011 New Revision: 1205967 URL: http://svn.apache.org/viewvc?rev=1205967view=rev Log: Sync the moves-scan-log branch with trunk. Modified: subversion/branches/moves-scan-log/ (props changed) subversion/branches/moves-scan-log/CHANGES

svn commit: r1206123 - /subversion/branches/moves-scan-log/subversion/svn/main.c

2011-11-25 Thread stsp
Author: stsp Date: Fri Nov 25 11:18:14 2011 New Revision: 1206123 URL: http://svn.apache.org/viewvc?rev=1206123view=rev Log: On the moves-scan-log branch: * subversion/svn/main.c (main): Avoid a passing parameter 1 from incompatible pointer type warning in the call

svn commit: r1206136 - in /subversion/branches/moves-scan-log/subversion: libsvn_client/update.c libsvn_wc/update_editor.c

2011-11-25 Thread stsp
Author: stsp Date: Fri Nov 25 12:20:39 2011 New Revision: 1206136 URL: http://svn.apache.org/viewvc?rev=1206136view=rev Log: On the moves-scan-log branch, allow the heuristic to consider multiple move destinations for same deleted node. The user will have to resolve ambiguity. For example

svn commit: r1206139 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

2011-11-25 Thread stsp
Author: stsp Date: Fri Nov 25 12:39:43 2011 New Revision: 1206139 URL: http://svn.apache.org/viewvc?rev=1206139view=rev Log: On the moves-scan-log branch, make the menu showing multiple move candidates a bit prettier. * subversion/svn/conflict-callbacks.c (format_move_chain_for_display

svn commit: r1206144 - in /subversion/branches/moves-scan-log/subversion/svn: cl.h conflict-callbacks.c

2011-11-25 Thread stsp
Author: stsp Date: Fri Nov 25 12:50:38 2011 New Revision: 1206144 URL: http://svn.apache.org/viewvc?rev=1206144view=rev Log: On the moves-scan-log branch, only show moves if the user actually chose 'f'. * subversion/svn/conflict-callbacks.c (svn_cl__conflict_baton_t

svn propchange: r1206136 - svn:log

2011-11-25 Thread stsp
Author: stsp Revision: 1206136 Modified property: svn:log Modified: svn:log at Fri Nov 25 12:55:24 2011 -- --- svn:log (original) +++ svn:log Fri Nov 25 12:55:24 2011 @@ -1,5 +1,5 @@ On the moves-scan-log branch, allow

svn commit: r1206576 - in /subversion/trunk/subversion: libsvn_client/diff.c svnlook/main.c tests/cmdline/depth_tests.py tests/cmdline/diff_tests.py tests/cmdline/special_tests.py

2011-11-26 Thread stsp
Author: stsp Date: Sat Nov 26 20:18:33 2011 New Revision: 1206576 URL: http://svn.apache.org/viewvc?rev=1206576view=rev Log: For issue #3814 (patch doesn't append newline to properties), make svn diff output a marker line \ No newline at end of property if a property value doesn't end

svn commit: r1206718 - in /subversion/trunk/subversion: libsvn_client/patch.c libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 13:35:14 2011 New Revision: 1206718 URL: http://svn.apache.org/viewvc?rev=1206718view=rev Log: Fix issue #3814 patch doesn't append newline to properties. This fix depends on the change made to 'svn diff' output in r1206576. * subversion/libsvn_diff/parse-diff.c

svn commit: r1206719 - in /subversion/trunk/subversion/bindings/javahl/tests/org: apache/subversion/javahl/BasicTests.java tigris/subversion/javahl/BasicTests.java

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 13:43:09 2011 New Revision: 1206719 URL: http://svn.apache.org/viewvc?rev=1206719view=rev Log: Follow-up to r1206576: Blind attempt to fix JavaHL test failure. [in subversion/bindings/javahl/tests] * org/tigris/subversion/javahl/BasicTests.java, org/apache

svn commit: r1206722 - /subversion/branches/1.7.x-issue3814/

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 14:20:01 2011 New Revision: 1206722 URL: http://svn.apache.org/viewvc?rev=1206722view=rev Log: Create branch for issue #3814 fix backport to 1.7.x. Added: subversion/branches/1.7.x-issue3814/ (props changed) - copied from r1206721, subversion/branches

svn commit: r1206724 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 14:41:56 2011 New Revision: 1206724 URL: http://svn.apache.org/viewvc?rev=1206724view=rev Log: Fix issue #3991, 'svn patch' deletes random lines with patch files missing trailing newline. Contrary to UNIX patch behaviour, I decided not to have 'svn patch' error out

svn commit: r1206725 - in /subversion/branches/1.7.x-issue3814: ./ subversion/bindings/javahl/tests/org/apache/subversion/javahl/ subversion/bindings/javahl/tests/org/tigris/subversion/javahl/ subvers

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 14:47:24 2011 New Revision: 1206725 URL: http://svn.apache.org/viewvc?rev=1206725view=rev Log: On the 1.7.x-issue3814 backport branch, merge the following revisions from trunk, resolving conflicts: r1166267: Merged to prevent conflicts in diff_tests.py. r1206576

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

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 14:51:26 2011 New Revision: 1206726 URL: http://svn.apache.org/viewvc?rev=1206726view=rev Log: * STATUS: Nominate issue #3814 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc

svn commit: r1206728 - /subversion/branches/1.7.x-issue3991/

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:00:07 2011 New Revision: 1206728 URL: http://svn.apache.org/viewvc?rev=1206728view=rev Log: Create a 1.7.x backport branch for issue #3991. Added: subversion/branches/1.7.x-issue3991/ (props changed) - copied from r1206727, subversion/branches/1.7.x

svn commit: r1206730 - in /subversion/branches/1.7.x-issue3991: ./ subversion/libsvn_client/patch.c subversion/libsvn_diff/parse-diff.c subversion/tests/cmdline/patch_tests.py

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:21:58 2011 New Revision: 1206730 URL: http://svn.apache.org/viewvc?rev=1206730view=rev Log: On the 1.7.x-issue3991 branch, merge the issue #3991 fix from trunk, resolving conflicts. This fix depends on a piece of the issue #3814 fix. This bit has been merged

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

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:27:36 2011 New Revision: 1206732 URL: http://svn.apache.org/viewvc?rev=1206732view=rev Log: * STATUS: Nominate #3991 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:32:52 2011 New Revision: 1206737 URL: http://svn.apache.org/viewvc?rev=1206737view=rev Log: * STATUS: typo (double negative) Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1206741 - /subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:39:43 2011 New Revision: 1206741 URL: http://svn.apache.org/viewvc?rev=1206741view=rev Log: Follow-up to r1206724: Fix an issue #3991 diff parsing test to make it pass. Found by: danielsh * subversion/tests/libsvn_diff/parse-diff-test.c (check_content): Allow

svn commit: r1206745 - in /subversion/branches/1.7.x-issue3991: ./ subversion/tests/libsvn_diff/parse-diff-test.c

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:47:05 2011 New Revision: 1206745 URL: http://svn.apache.org/viewvc?rev=1206745view=rev Log: Merge r1150344, r1158929 and r1206741 from trunk into 1.7.x-issue3991. r1150344 - merged to avoid conflicts r1158929 - adds a new diff parsing regression test

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

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:49:49 2011 New Revision: 1206746 URL: http://svn.apache.org/viewvc?rev=1206746view=rev Log: * STATUS: Note additional revs merged into the 1.7.x-issue3991 branch. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL

svn commit: r1206748 - /subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c

2011-11-27 Thread stsp
Author: stsp Date: Sun Nov 27 15:51:08 2011 New Revision: 1206748 URL: http://svn.apache.org/viewvc?rev=1206748view=rev Log: * subversion/tests/libsvn_diff/parse-diff-test.c (test_parse_unidiff_lacking_trailing_eol): Remove obsolete comment. Found by: danielsh Modified: subversion/trunk

svn propchange: r1206724 - svn:log

2011-11-27 Thread stsp
Author: stsp Revision: 1206724 Modified property: svn:log Modified: svn:log at Sun Nov 27 16:03:29 2011 -- --- svn:log (original) +++ svn:log Sun Nov 27 16:03:29 2011 @@ -16,7 +16,7 @@ by appending an EOL. There are two

svn commit: r1207013 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 08:21:30 2011 New Revision: 1207013 URL: http://svn.apache.org/viewvc?rev=1207013view=rev Log: On the moves-scan-log branch: * subversion/libsvn_wc/update_editor.c (find_applicable_moves): Remove obsolete TODO comment. Modified: subversion/branches/moves-scan

svn commit: r1207041 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_wc/tree_conflicts.c libsvn_wc/update_editor.c svn/tree-conflicts.c

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 09:42:20 2011 New Revision: 1207041 URL: http://svn.apache.org/viewvc?rev=1207041view=rev Log: On the moves-scan-log branch, introduce the new 'incoming move away' tree conflict action and start using it. Also, tweak semantics

svn commit: r1207511 - /subversion/branches/1.7.x-svn-patch-eol-fixes/

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 19:05:38 2011 New Revision: 1207511 URL: http://svn.apache.org/viewvc?rev=1207511view=rev Log: Create a combined 1.7.x backport branch for issues #3814 and #3991. Added: subversion/branches/1.7.x-svn-patch-eol-fixes/ (props changed) - copied from

svn commit: r1207512 - in /subversion/branches/1.7.x-svn-patch-eol-fixes: ./ subversion/bindings/javahl/tests/org/apache/subversion/javahl/ subversion/bindings/javahl/tests/org/tigris/subversion/javah

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 19:06:34 2011 New Revision: 1207512 URL: http://svn.apache.org/viewvc?rev=1207512view=rev Log: On the 1.7.x-svn-patch-eol-fixes branch, merge the following from trunk: r1150344: Merged to avoid conflicts in diff parsing test. r1158923: Adds a cmdline regression test

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

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 19:11:39 2011 New Revision: 1207514 URL: http://svn.apache.org/viewvc?rev=1207514view=rev Log: * STATUS: Nominate the combined issue #3814 and #3991 fix instead of individual fixes. The fixes overlap. Modified: subversion/branches/1.7.x/STATUS Modified

svn commit: r1207516 - in /subversion/branches: 1.7.x-issue3814/ 1.7.x-issue3991/

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 19:12:26 2011 New Revision: 1207516 URL: http://svn.apache.org/viewvc?rev=1207516view=rev Log: Remove branches superseded by 1.7.x-svn-patch-eol-fixes branch. Removed: subversion/branches/1.7.x-issue3814/ subversion/branches/1.7.x-issue3991/

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

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 19:19:58 2011 New Revision: 1207526 URL: http://svn.apache.org/viewvc?rev=1207526view=rev Log: * STATUS: spacing 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

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

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 21:01:52 2011 New Revision: 1207605 URL: http://svn.apache.org/viewvc?rev=1207605view=rev Log: * STATUS: Describe problem in svn-patch-eol fixes and veto for now. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http

svn commit: r1207656 - /subversion/trunk/subversion/libsvn_diff/parse-diff.c

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 22:21:56 2011 New Revision: 1207656 URL: http://svn.apache.org/viewvc?rev=1207656view=rev Log: * subversion/libsvn_diff/parse-diff.c (parse_next_hunk): When testing a boolean accessed via a pointer it kinda makes sense to dereference the pointer. Modified

svn commit: r1207663 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 22:34:49 2011 New Revision: 1207663 URL: http://svn.apache.org/viewvc?rev=1207663view=rev Log: Make the diff parser handle comment lines indicating missing EOLs if such comments appear within the diff text of a hunk, not just at the very end of the hunk's diff text

svn commit: r1207668 - in /subversion/branches/1.7.x-svn-patch-eol-fixes: ./ subversion/libsvn_diff/parse-diff.c subversion/tests/cmdline/patch_tests.py

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 22:39:59 2011 New Revision: 1207668 URL: http://svn.apache.org/viewvc?rev=1207668view=rev Log: On the 1.7.x-svn-patch-eol-fixes branch, merge r1207656 and r1207663 from trunk. Modified: subversion/branches/1.7.x-svn-patch-eol-fixes/ (props changed

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

2011-11-28 Thread stsp
Author: stsp Date: Mon Nov 28 22:44:01 2011 New Revision: 1207673 URL: http://svn.apache.org/viewvc?rev=1207673view=rev Log: * STATUS: Re-nominate the 1.7.x-svn-patch-eol-fixes branch. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http

<    1   2   3   4   5   6   7   8   9   10   >