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

Author: stsp Date: Mon Nov 28 08:21:30 2011 New Revision: 1207013 URL: http://svn.apache.org/viewvc?rev=1207013&view=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

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

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

Author: philip Date: Mon Nov 28 11:54:56 2011 New Revision: 1207095 URL: http://svn.apache.org/viewvc?rev=1207095&view=rev Log: * STATUS: 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/S

[Subversion Wiki] Update of "ServerDictatedConfiguration" by CMichaelPilato

Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "ServerDictatedConfiguration" page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/ServerDictatedConfiguration?action=diff&rev1=3&rev2=4 === Other Relate

[Subversion Wiki] Update of "ServerDictatedConfiguration" by CMichaelPilato

Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "ServerDictatedConfiguration" page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/ServerDictatedConfiguration?action=diff&rev1=4&rev2=5 === Other Relate

[Subversion Wiki] Update of "ServerDictatedConfiguration" by CMichaelPilato

Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification. The "ServerDictatedConfiguration" page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/ServerDictatedConfiguration?action=diff&rev1=5&rev2=6 * [[http://svn

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

Author: pburba Date: Mon Nov 28 15:10:26 2011 New Revision: 1207280 URL: http://svn.apache.org/viewvc?rev=1207280&view=rev Log: * STATUS: Vote and approve issue #4044 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewv

svn propchange: r1201824 - svn:log

Author: pburba Revision: 1201824 Modified property: svn:log Modified: svn:log at Mon Nov 28 15:15:50 2011 -- --- svn:log (original) +++ svn:log Mon Nov 28 15:15:50 2011 @@ -4,7 +4,7 @@ create patch". When adding a file in

svn commit: r1207292 - /subversion/branches/showing-merge-info/subversion/tests/cmdline/diff_tests.py

Author: pburba Date: Mon Nov 28 15:22:02 2011 New Revision: 1207292 URL: http://svn.apache.org/viewvc?rev=1207292&view=rev Log: * subversion/tests/cmdline/diff_tests.py (diff_targets): Add Issue decorator for issue #2873. Modified: subversion/branches/showing-merge-info/subversion/tests/cm

svn commit: r1207313 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/externals.c

Author: hwright Date: Mon Nov 28 15:40:41 2011 New Revision: 1207313 URL: http://svn.apache.org/viewvc?rev=1207313&view=rev Log: Merge r1188774, r1197135 from trunk: * r1188774, 1197135 Fix issue #4044, "empty parents of externals not removed along with externals on update". Justificati

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

Author: pburba Date: Mon Nov 28 15:49:16 2011 New Revision: 1207325 URL: http://svn.apache.org/viewvc?rev=1207325&view=rev Log: * STATUS: Vote and approve issue #2873 fix. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc

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

Author: rhuijben Date: Mon Nov 28 15:58:46 2011 New Revision: 1207336 URL: http://svn.apache.org/viewvc?rev=1207336&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/bran

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

Author: rhuijben Date: Mon Nov 28 16:01:52 2011 New Revision: 1207342 URL: http://svn.apache.org/viewvc?rev=1207342&view=rev Log: * STATUS: Cast one more vote Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/b

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

Author: philip Date: Mon Nov 28 16:04:32 2011 New Revision: 1207349 URL: http://svn.apache.org/viewvc?rev=1207349&view=rev Log: * STATUS: 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/S

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

Author: hwright Date: Mon Nov 28 16:05:16 2011 New Revision: 1207351 URL: http://svn.apache.org/viewvc?rev=1207351&view=rev Log: Reintegrate the 1.7.x-r1201824 branch: * r1201824 Fix issue #2873. Justification: svn diff -c N on a file added in revision N is broken. Not a regressi

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

Author: philip Date: Mon Nov 28 16:07:48 2011 New Revision: 1207357 URL: http://svn.apache.org/viewvc?rev=1207357&view=rev Log: * STATUS: Remove duplicate revision. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subver

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

Author: rhuijben Date: Mon Nov 28 16:11:26 2011 New Revision: 1207363 URL: http://svn.apache.org/viewvc?rev=1207363&view=rev Log: * STATUS: Add missing vote on nomination I moved to approved Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://sv

svn commit: r1207368 - in /subversion/branches/1.7.x: ./ STATUS subversion/mod_dav_svn/repos.c

Author: hwright Date: Mon Nov 28 16:12:28 2011 New Revision: 1207368 URL: http://svn.apache.org/viewvc?rev=1207368&view=rev Log: Merge r1204610, r1204673 from trunk: * r1204610, r1204673 Log error chain, rather than generic error, when opening rep-cache.db fails. Justification: Makes

svn commit: r1207370 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_fs_base/reps-strings.c

Author: hwright Date: Mon Nov 28 16:13:38 2011 New Revision: 1207370 URL: http://svn.apache.org/viewvc?rev=1207370&view=rev Log: Merge r1205726 from trunk: * r1205726 Plug a memory leak in the fs-base deltification logic which has been observed to exhaust all the available memory on a serv

svn commit: r1207372 - in /subversion/branches/1.7.x: ./ STATUS subversion/svn/main.c subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Author: hwright Date: Mon Nov 28 16:15:25 2011 New Revision: 1207372 URL: http://svn.apache.org/viewvc?rev=1207372&view=rev Log: Merge r1206523, r1206533 from trunk: * r1206523, r1206533 Update --accept help text. Justification: Completeness. Better late than never. Votes: +1

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

Author: cmpilato Date: Mon Nov 28 16:20:59 2011 New Revision: 1207379 URL: http://svn.apache.org/viewvc?rev=1207379&view=rev Log: 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.

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

Author: pburba Date: Mon Nov 28 16:42:02 2011 New Revision: 1207411 URL: http://svn.apache.org/viewvc?rev=1207411&view=rev Log: * STATUS: Vote and approve r1205193. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subver

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

Author: hwright Date: Mon Nov 28 17:04:12 2011 New Revision: 1207455 URL: http://svn.apache.org/viewvc?rev=1207455&view=rev Log: Merge r1205193 from trunk: * r1205193 Fix 'svn import' with svn:eol-style 'native' and inconsistent EOLs. Justification: 'svn import' with auto-props settin

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

Author: philip Date: Mon Nov 28 17:31:56 2011 New Revision: 1207474 URL: http://svn.apache.org/viewvc?rev=1207474&view=rev Log: * STATUS: 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/S

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

Author: hwright Date: Mon Nov 28 17:35:28 2011 New Revision: 1207476 URL: http://svn.apache.org/viewvc?rev=1207476&view=rev Log: Remove some weirdly-placed whitespace Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subv

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

Author: stsp Date: Mon Nov 28 19:05:38 2011 New Revision: 1207511 URL: http://svn.apache.org/viewvc?rev=1207511&view=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 r120751

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

Author: stsp Date: Mon Nov 28 19:06:34 2011 New Revision: 1207512 URL: http://svn.apache.org/viewvc?rev=1207512&view=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

Author: stsp Date: Mon Nov 28 19:11:39 2011 New Revision: 1207514 URL: http://svn.apache.org/viewvc?rev=1207514&view=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: subv

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

Author: stsp Date: Mon Nov 28 19:12:26 2011 New Revision: 1207516 URL: http://svn.apache.org/viewvc?rev=1207516&view=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

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

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

Author: philip Date: Mon Nov 28 19:27:51 2011 New Revision: 1207528 URL: http://svn.apache.org/viewvc?rev=1207528&view=rev Log: Add an XFAIL regression test: nested moves cannot be committed. * subversion/tests/cmdline/copy_tests.py (three_nested_moves): New XFAIL test. (test_list): Add new t

svn commit: r1207539 - /subversion/site/publish/docs/svn-merge.txt

Author: danielsh Date: Mon Nov 28 19:42:41 2011 New Revision: 1207539 URL: http://svn.apache.org/viewvc?rev=1207539&view=rev Log: * docs/svn-merge.txt: Note that this informatino also exists in the book. Set and use svn:keywords. (Note: this file is linked from

svn commit: r1207555 - in /subversion/trunk: contrib/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/ tools/server-side/mod_dontdothat/mod_dontdothat.c

Author: danielsh Date: Mon Nov 28 20:02:41 2011 New Revision: 1207555 URL: http://svn.apache.org/viewvc?rev=1207555&view=rev Log: Promote mod_dontdothat to tools/ and relicense it under ALv2. Discussed with: hwright, igalic, stsp * contrib/server-side/mod_dontdothat/: Move this.. * tools/server-

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

Author: danielsh Date: Mon Nov 28 20:05:18 2011 New Revision: 1207557 URL: http://svn.apache.org/viewvc?rev=1207557&view=rev Log: Nominate r1207555 for/by stsp. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion

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

Author: pburba Date: Mon Nov 28 20:08:53 2011 New Revision: 1207558 URL: http://svn.apache.org/viewvc?rev=1207558&view=rev Log: * STATUS: Vote and approve r1205839 group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/

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

Author: stsp Date: Mon Nov 28 21:01:52 2011 New Revision: 1207605 URL: http://svn.apache.org/viewvc?rev=1207605&view=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: r1207634 - /subversion/branches/1.7.x/STATUS

Author: pburba Date: Mon Nov 28 21:37:11 2011 New Revision: 1207634 URL: http://svn.apache.org/viewvc?rev=1207634&view=rev Log: * STATUS: Vote and approve issue #4042 group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/view

svn commit: r1207641 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_fs_base/bdb/locks-table.c

Author: hwright Date: Mon Nov 28 21:52:27 2011 New Revision: 1207641 URL: http://svn.apache.org/viewvc?rev=1207641&view=rev Log: Merge r1205839, r1205848 from trunk: * r1205839, r1205848 Fix reading beyond end of a (not null-terminated) string in BDB lock code. Justification: Undefine

svn commit: r1207643 - in /subversion/branches/1.7.x: ./ subversion/libsvn_wc/ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/ subversion/tests/libsvn_wc/

Author: hwright Date: Mon Nov 28 21:54:20 2011 New Revision: 1207643 URL: http://svn.apache.org/viewvc?rev=1207643&view=rev Log: Merge r1188652, r1188677, r1188762 from trunk: * r1188652, r1188677, r1188762 Fix issue 4042, commit incomplete directory asserts. Justification: Regression

svn commit: r1207650 - /subversion/trunk/CHANGES

Author: hwright Date: Mon Nov 28 22:07:07 2011 New Revision: 1207650 URL: http://svn.apache.org/viewvc?rev=1207650&view=rev Log: * CHANGES (1.7.2): Sync with branch, and add potential release date. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apach

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

Author: stsp Date: Mon Nov 28 22:21:56 2011 New Revision: 1207656 URL: http://svn.apache.org/viewvc?rev=1207656&view=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

Author: stsp Date: Mon Nov 28 22:34:49 2011 New Revision: 1207663 URL: http://svn.apache.org/viewvc?rev=1207663&view=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

Author: stsp Date: Mon Nov 28 22:39:59 2011 New Revision: 1207668 URL: http://svn.apache.org/viewvc?rev=1207668&view=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) subver

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

Author: stsp Date: Mon Nov 28 22:44:01 2011 New Revision: 1207673 URL: http://svn.apache.org/viewvc?rev=1207673&view=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://svn.apa

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

Author: stsp Date: Mon Nov 28 22:55:01 2011 New Revision: 1207678 URL: http://svn.apache.org/viewvc?rev=1207678&view=rev Log: * STATUS: Tweak 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