You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2016/10/03 09:22:47 UTC
svn commit: r1763138 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: ivan
Date: Mon Oct 3 09:22:46 2016
New Revision: 1763138
URL: http://svn.apache.org/viewvc?rev=1763138&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_text_get_resolution_options,
svn_client_conflict_prop_get_resolution_options): Set CONFLICT member to
proper value instead of NULL.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1763138&r1=1763137&r2=1763138&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Oct 3 09:22:46 2016
@@ -6875,6 +6875,7 @@ svn_client_conflict_text_get_resolution_
*option = binary_conflict_options[i];
option->pool = result_pool;
option->description = _(option->description);
+ option->conflict = conflict;
APR_ARRAY_PUSH((*options), const svn_client_conflict_option_t *) =
option;
}
@@ -6891,6 +6892,7 @@ svn_client_conflict_text_get_resolution_
*option = text_conflict_options[i];
option->pool = result_pool;
option->description = _(option->description);
+ option->conflict = conflict;
APR_ARRAY_PUSH((*options), const svn_client_conflict_option_t *) =
option;
}
@@ -6922,6 +6924,7 @@ svn_client_conflict_prop_get_resolution_
*option = prop_conflict_options[i];
option->pool = result_pool;
option->description = _(option->description);
+ option->conflict = conflict;
APR_ARRAY_PUSH((*options), const svn_client_conflict_option_t *) = option;
}