svn commit: r1687498 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c

[stsp]

Author: stsp
Date: Thu Jun 25 12:48:48 2015
New Revision: 1687498

URL: http://svn.apache.org/r1687498
Log:
Add a client context parameter to svn_client_conflict_get().

* subversion/include/svn_client.h
  (svn_client_conflict_get): Add client context parameter.

* subversion/libsvn_client/resolved.c
  (svn_client_conflict_t): Add client context.
  (svn_client_conflict_get): Add client context parameter.
  (svn_client_conflict_from_wc_description2_t): Pass NULL for client context.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1687498&r1=1687497&r2=1687498&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jun 25 12:48:48 2015
@@ -4370,6 +4370,7 @@ typedef struct svn_client_conflict_t svn
  */
 svn_client_conflict_t *
 svn_client_conflict_get(const char *local_abspath,
+                        svn_client_ctx_t *ctx,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool);
 

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1687498&r1=1687497&r2=1687498&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jun 25 12:48:48 
2015
@@ -151,12 +151,14 @@ svn_client_resolve(const char *path,
 struct svn_client_conflict_t
 {
   const char *local_abspath;
+  svn_client_ctx_t *ctx;
 
   const svn_wc_conflict_description2_t *desc2; /* ### temporary */
 };
 
 svn_client_conflict_t *
 svn_client_conflict_get(const char *local_abspath,
+                        svn_client_ctx_t *ctx,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
@@ -164,6 +166,7 @@ svn_client_conflict_get(const char *loca
 
   conflict = apr_pcalloc(result_pool, sizeof(*conflict));
   conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
+  conflict->ctx = ctx;
 
   return conflict;
 }
@@ -176,7 +179,7 @@ svn_client_conflict_from_wc_description2
 {
   svn_client_conflict_t *conflict;
 
-  conflict = svn_client_conflict_get(desc->local_abspath,
+  conflict = svn_client_conflict_get(desc->local_abspath, NULL,
                                      result_pool, scratch_pool);
   conflict->desc2 = desc;