svn commit: r1174582 - /subversion/trunk/subversion/libsvn_wc/status.c

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 08:20:00 2011 New Revision: 1174582 URL: http://svn.apache.org/viewvc?rev=1174582view=rev Log: Follow-up to r1171353. * subversion/libsvn_wc/status.c (one_child_status): Use correct node kind const. No functional change expected, since by coincidence,

svn propchange: r1174139 - svn:log

2011-09-23 Thread neels
Author: neels Revision: 1174139 Modified property: svn:log Modified: svn:log at Fri Sep 23 08:34:44 2011 -- --- svn:log (original) +++ svn:log Fri Sep 23 08:34:44 2011 @@ -1,3 +1,4 @@ +-- This was reverted in r1174166,

svn commit: r1174612 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 09:30:18 2011 New Revision: 1174612 URL: http://svn.apache.org/viewvc?rev=1174612view=rev Log: * subversion/libsvn_wc/wc-metadata.sql (format-99): Add a todo comment. Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Modified:

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

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 09:52:09 2011 New Revision: 1174625 URL: http://svn.apache.org/viewvc?rev=1174625view=rev Log: * ../branches/1.7.x/STATUS: Remove premature nomination of r1174342 :/ Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

2011-09-23 Thread ivan
Author: ivan Date: Fri Sep 23 11:01:09 2011 New Revision: 1174652 URL: http://svn.apache.org/viewvc?rev=1174652view=rev Log: Fix Windows retry loop error handling when removing file. * subversion/libsvn_subr/io.c (svn_io_remove_file2): Check apr_err before returning error to handle

svn commit: r1174665 - /subversion/branches/1.7.x/subversion/libsvn_subr/io.c

2011-09-23 Thread ivan
Author: ivan Date: Fri Sep 23 11:21:17 2011 New Revision: 1174665 URL: http://svn.apache.org/viewvc?rev=1174665view=rev Log: * STATUS: Propose r1174652 for backport. Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c Modified:

svn commit: r1174666 - /subversion/branches/1.7.x/subversion/libsvn_subr/io.c

2011-09-23 Thread ivan
Author: ivan Date: Fri Sep 23 11:23:38 2011 New Revision: 1174666 URL: http://svn.apache.org/viewvc?rev=1174666view=rev Log: Revert r1174665: I've acidentally committed wrong file. Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c Modified:

svn propchange: r1174665 - svn:log

2011-09-23 Thread ivan
Author: ivan Revision: 1174665 Modified property: svn:log Modified: svn:log at Fri Sep 23 11:24:44 2011 -- --- svn:log (original) +++ svn:log Fri Sep 23 11:24:44 2011 @@ -1 +1,3 @@ +[ Note from the future: reverted in

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

2011-09-23 Thread ivan
Author: ivan Date: Fri Sep 23 11:25:26 2011 New Revision: 1174667 URL: http://svn.apache.org/viewvc?rev=1174667view=rev Log: * STATUS: Propose r1174652 for backport. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1174693 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/cleanup.c libsvn_client/externals.c libsvn_wc/externals.c

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 12:17:24 2011 New Revision: 1174693 URL: http://svn.apache.org/viewvc?rev=1174693view=rev Log: Follow-up to r1174342. Fix some errors around relative externals URLs during upgrade, and around checked out WCs at an external's target path which don't match the

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

2011-09-23 Thread philip
Author: philip Date: Fri Sep 23 12:26:22 2011 New Revision: 1174697 URL: http://svn.apache.org/viewvc?rev=1174697view=rev Log: * STATUS: Vote for r1174652. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 12:28:52 2011 New Revision: 1174699 URL: http://svn.apache.org/viewvc?rev=1174699view=rev Log: Remove stuff obsoleted by r1174342, r1174693. * subversion/libsvn_wc/wc_db.c (svn_wc__db_upgrade_apply_props): Remove loop adding rows to EXTERNALS table. After above

svn commit: r1174714 - /subversion/branches/1.7.x-i4016/

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 12:51:22 2011 New Revision: 1174714 URL: http://svn.apache.org/viewvc?rev=1174714view=rev Log: * ../branches/1.7.x-i4016: Create backport branch for issue #4016. Added: subversion/branches/1.7.x-i4016/ (props changed) - copied from r1174713,

svn commit: r1174721 - in /subversion/branches/1.7.x-i4016: ./ subversion/libsvn_client/externals.c

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 12:59:30 2011 New Revision: 1174721 URL: http://svn.apache.org/viewvc?rev=1174721view=rev Log: Merge r1173574 from trunk. Cosmetic change to a function that is going to be moved in r1174693. * subversion/libsvn_client/externals.c (resolve_relative_external_url):

svn commit: r1174725 - in /subversion/branches/1.7.x-i4016: ./ subversion/include/private/svn_wc_private.h subversion/libsvn_client/cleanup.c subversion/libsvn_wc/upgrade.c subversion/libsvn_wc/wc_db.

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 13:02:22 2011 New Revision: 1174725 URL: http://svn.apache.org/viewvc?rev=1174725view=rev Log: Merge r1174342, part one of issue #4016 fix. Issue #4016. Try to find proper URL information on externals during upgrade. Do this after the entire upgrade ran through, as

svn commit: r1174732 - in /subversion/branches/1.7.x-i4016: ./ subversion/include/private/svn_wc_private.h subversion/libsvn_client/cleanup.c subversion/libsvn_client/externals.c subversion/libsvn_wc/

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 13:11:21 2011 New Revision: 1174732 URL: http://svn.apache.org/viewvc?rev=1174732view=rev Log: Merge r1174693, part two of issue #4016 fix. Resolve a text conflict to theirs-conflict because of indentation mismatch (caused by a cosmetic change from r1169770 in

svn commit: r1174735 - in /subversion/branches/1.7.x-i4016: ./ subversion/libsvn_wc/wc-queries.sql subversion/libsvn_wc/wc_db.c

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 13:13:40 2011 New Revision: 1174735 URL: http://svn.apache.org/viewvc?rev=1174735view=rev Log: Merge r1174699, removing stuff obsoleted by the previous two merged revisions. Remove stuff obsoleted by r1174342, r1174693. * subversion/libsvn_wc/wc_db.c

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

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 13:38:13 2011 New Revision: 1174749 URL: http://svn.apache.org/viewvc?rev=1174749view=rev Log: Approve r1174652. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1174752 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/io.c

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 13:39:47 2011 New Revision: 1174752 URL: http://svn.apache.org/viewvc?rev=1174752view=rev Log: Merge r1174652 from trunk: * r1174652 Fix Windows retry loop error handling when removing file. On some cases svn_io_remove_file2() returns error Can't remove

svn commit: r1174761 - /subversion/trunk/build/ac-macros/zlib.m4

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 13:49:03 2011 New Revision: 1174761 URL: http://svn.apache.org/viewvc?rev=1174761view=rev Log: Give a better error message when configured with '--without-zlib'. * build/ac-macros/zlib.m4 (SVN_LIB_Z): Look for $withval=no as well. Patch by: Alexander Thomas

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

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 13:50:35 2011 New Revision: 1174763 URL: http://svn.apache.org/viewvc?rev=1174763view=rev Log: Nominate r1174761. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

2011-09-23 Thread neels
Author: neels Date: Fri Sep 23 14:01:04 2011 New Revision: 1174774 URL: http://svn.apache.org/viewvc?rev=1174774view=rev Log: * ../branches/1.7.x/STATUS: Nominate r1173574, r1174342, r1174693, r1174699. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS

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

2011-09-23 Thread pburba
Author: pburba Date: Fri Sep 23 14:23:20 2011 New Revision: 1174797 URL: http://svn.apache.org/viewvc?rev=1174797view=rev Log: Revert a small part of the issue #3668 and issue #3669 fixes that escaped the reversion of those same fixes in r1173425 -- see

svn commit: r1174798 - /subversion/trunk/build/ac-macros/zlib.m4

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 14:23:31 2011 New Revision: 1174798 URL: http://svn.apache.org/viewvc?rev=1174798view=rev Log: * build/ac-macros/zlib.m4 (SVN_LIB_Z): DTRT when --with-zlib is passed without an argument. Found by: philip Modified: subversion/trunk/build/ac-macros/zlib.m4

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

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 14:27:01 2011 New Revision: 1174803 URL: http://svn.apache.org/viewvc?rev=1174803view=rev Log: Nominate r1174798. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1174806 - /subversion/trunk/build/ac-macros/zlib.m4

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 14:28:29 2011 New Revision: 1174806 URL: http://svn.apache.org/viewvc?rev=1174806view=rev Log: * build/ac-macros/zlib.m4 (SVN_LIB_Z): Don't lose the environment's $LDFLAGS for the AC_CHECK_LIB() call. Modified: subversion/trunk/build/ac-macros/zlib.m4

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

2011-09-23 Thread danielsh
Author: danielsh Date: Fri Sep 23 14:30:25 2011 New Revision: 1174809 URL: http://svn.apache.org/viewvc?rev=1174809view=rev Log: Nominate r1174798 with an stsp justification. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

2011-09-23 Thread pburba
Author: pburba Date: Fri Sep 23 14:33:03 2011 New Revision: 1174813 URL: http://svn.apache.org/viewvc?rev=1174813view=rev Log: * STATUS: Add 1174797 to the r1173425 (Issue #4013) group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

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

2011-09-23 Thread philip
Author: philip Date: Fri Sep 23 16:17:06 2011 New Revision: 1174860 URL: http://svn.apache.org/viewvc?rev=1174860view=rev Log: * STATUS: Adjust vote. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1175068 - /subversion/trunk/get-deps.sh

2011-09-23 Thread arfrever
Author: arfrever Date: Fri Sep 23 23:19:55 2011 New Revision: 1175068 URL: http://svn.apache.org/viewvc?rev=1175068view=rev Log: * get-deps.sh: Update SQLite version. Modified: subversion/trunk/get-deps.sh Modified: subversion/trunk/get-deps.sh URL:

svn propchange: r1174039 - svn:log

2011-09-23 Thread arfrever
Author: arfrever Revision: 1174039 Modified property: svn:log Modified: svn:log at Fri Sep 23 23:20:52 2011 -- --- svn:log (original) +++ svn:log Fri Sep 23 23:20:52 2011 @@ -1 +1 @@ -* get-deps.sh: Bump httpd version so