You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/04/24 06:01:12 UTC
svn commit: r1589571 - in /subversion/branches/1.8.x: ./ STATUS configure.ac
subversion/include/private/svn_dep_compat.h subversion/libsvn_subr/prompt.c
subversion/tests/libsvn_wc/utils.c
Author: svn-role
Date: Thu Apr 24 04:01:12 2014
New Revision: 1589571
URL: http://svn.apache.org/r1589571
Log:
Merge the 1.8.x-apr-0.9 branch:
* 1585499
Build with apr-0.9.x.
Justification:
1.8 claims 0.9 support but it doesn't work.
Branch:
^/subversion/branches/1.8.x-apr-0.9
Votes:
+1: philip, rhuijben, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/configure.ac (contents, props changed)
subversion/branches/1.8.x/subversion/include/private/svn_dep_compat.h
subversion/branches/1.8.x/subversion/libsvn_subr/prompt.c
subversion/branches/1.8.x/subversion/tests/libsvn_wc/utils.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x-apr-0.9:r1585493-1589570
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1589571&r1=1589570&r2=1589571&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Apr 24 04:01:12 2014
@@ -315,17 +315,6 @@ Approved changes:
Votes:
+1: philip, rhuijben, stefan2
- * r1577151
- Make 'svn merge' honor the 'preserved-conflict-file-exts' setting.
- Justification:
- While really a behavior change that doesn't belong in a patch release
- I'm guessing nobody knew that we didn't implement this flag in this
- scenario.
- Branch:
- ^/subversion/branches/1.8.x-r1577151
- Votes:
- +1: rhuijben, steveking, stefan2
-
* r1578273, r1578311, r1578326
Make svn_ra_get_locks() and svn_ra_get_lock() report not locked nodes
with a NULL svn_lock_t *, as documented.
Modified: subversion/branches/1.8.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/configure.ac?rev=1589571&r1=1589570&r2=1589571&view=diff
==============================================================================
--- subversion/branches/1.8.x/configure.ac (original)
+++ subversion/branches/1.8.x/configure.ac Thu Apr 24 04:01:12 2014
@@ -98,7 +98,7 @@ dnl now generating errors instead of s
dnl them. Only .7 and later can guarantee repository
dnl integrity with FSFS.
-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
+APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
SVN_LIB_APR($APR_VER_REGEXES)
Propchange: subversion/branches/1.8.x/configure.ac
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x-apr-0.9/configure.ac:r1585493-1589570
Modified: subversion/branches/1.8.x/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/private/svn_dep_compat.h?rev=1589571&r1=1589570&r2=1589571&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/branches/1.8.x/subversion/include/private/svn_dep_compat.h Thu Apr 24 04:01:12 2014
@@ -78,6 +78,7 @@ void svn_hash__clear(struct apr_hash_t *
#if !APR_VERSION_AT_LEAST(1,0,0)
#define APR_UINT64_C(val) UINT64_C(val)
#define APR_FPROT_OS_DEFAULT APR_OS_DEFAULT
+#define apr_hash_make_custom(pool,hash_func) apr_hash_make(pool)
#endif
#if !APR_VERSION_AT_LEAST(1,3,0)
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/prompt.c?rev=1589571&r1=1589570&r2=1589571&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/prompt.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/prompt.c Thu Apr 24 04:01:12 2014
@@ -177,7 +177,7 @@ terminal_open(terminal_handle_t **termin
and stderr for prompting. */
apr_file_t *tmpfd;
status = apr_file_open(&tmpfd, "/dev/tty",
- APR_FOPEN_READ | APR_FOPEN_WRITE,
+ APR_READ | APR_WRITE,
APR_OS_DEFAULT, pool);
*terminal = apr_palloc(pool, sizeof(terminal_handle_t));
if (!status)
Modified: subversion/branches/1.8.x/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/libsvn_wc/utils.c?rev=1589571&r1=1589570&r2=1589571&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/branches/1.8.x/subversion/tests/libsvn_wc/utils.c Thu Apr 24 04:01:12 2014
@@ -23,6 +23,7 @@
#include "svn_error.h"
#include "svn_client.h"
#include "svn_pools.h"
+#include "private/svn_dep_compat.h"
#include "utils.h"