Author: stsp
Date: Sat Jun 27 09:15:24 2015
New Revision: 1687893
URL: http://svn.apache.org/r1687893
Log:
Remove planned support for setting the merged text in svn_client_conflict API.
This option cannot be implemented without using the existing conflict
callback since libsvn_wc does not offer this functionality elsewhere.
I'm unsure if this functionality will ever be needed, since resolvers can
create a merged version from the file contents provided, and external merge
tools might as well modify the working file directly.
* subversion/include/svn_client.h
(svn_client_conflict_option_merged_text): Mark as unsupported.
(svn_client_conflict_option_set_merged_text): Remove declaration.
* subversion/libsvn_client/resolved.c
(text_conflict_options): Remove svn_client_conflict_option_merged_text.
(svn_client_conflict_option_set_merged_text): Remove implementation stub.
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=1687893&r1=1687892&r2=1687893&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Sat Jun 27 09:15:24 2015
@@ -4380,7 +4380,7 @@ typedef enum svn_client_conflict_option_
svn_client_conflict_option_working_text,
svn_client_conflict_option_incoming_new_text_for_conflicted_hunks_only,
svn_client_conflict_option_working_text_for_conflicted_hunks_only,
- svn_client_conflict_option_merged_text,
+ svn_client_conflict_option_merged_text, /* unsupported */
svn_client_conflict_option_unspecified
/* Values derived from svn_wc_conflict_choice_t end here. */
@@ -4494,18 +4494,6 @@ svn_client_conflict_option_describe(cons
apr_pool_t *scratch_pool);
/**
- * Use contents of the file at @a merged_abspath as merged text for @a option.
- * Only applicable if the option ID is svn_client_conflict_option_merged_text.
- *
- * ### Should accepting svn_stream_t instead of a path?
- * @since New in 1.10.
- */
-svn_error_t *
-svn_client_conflict_option_set_merged_text(svn_client_conflict_option_t
*option,
- const char *merged_abspath,
- apr_pool_t *scratch_pool);
-
-/**
* Resolve @a conflict using resolution option @a option.
*
* @since New in 1.10.
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1687893&r1=1687892&r2=1687893&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jun 27 09:15:24
2015
@@ -384,17 +384,6 @@ static const svn_client_conflict_option_
resolve_text_conflict
},
-#if 0
- /* ### There seems to be no way to pass merged_abspath to libsvn_wc
- * ### without using the conflict callback. Do we really need this? */
- {
- svn_client_conflict_option_merged_text,
- N_("accept merged version of file"),
- NULL,
- resolve_text_conflict
- },
-#endif
-
};
/* Resolver options for a binary file conflict */
@@ -606,17 +595,6 @@ svn_client_conflict_option_describe(cons
return SVN_NO_ERROR;
}
-
-svn_error_t *
-svn_client_conflict_option_set_merged_text(svn_client_conflict_option_t
*option,
- const char *merged_abspath,
- apr_pool_t *scratch_pool)
-{
- /* TODO */
- SVN_ERR_ASSERT(FALSE);
-
- return SVN_NO_ERROR;
-}
svn_error_t *
svn_client_conflict_resolve(svn_client_conflict_t *conflict,
