subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1560875 - in /subversion/branches/1.8.x: ./ subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h
Date Fri, 24 Jan 2014 01:36:35 GMT
Author: breser
Date: Fri Jan 24 01:36:35 2014
New Revision: 1560875

URL: http://svn.apache.org/r1560875
Log:
Merge r1480681 from trunk: documentation fix

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/subversion/include/svn_wc.h
    subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.h

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1480681

Modified: subversion/branches/1.8.x/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_wc.h?rev=1560875&r1=1560874&r2=1560875&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_wc.h Fri Jan 24 01:36:35 2014
@@ -2109,9 +2109,8 @@ typedef struct svn_wc_conflict_result_t
  * Allocate an #svn_wc_conflict_result_t structure in @a pool,
  * initialize and return it.
  *
- * Set the @c choice field of the structure to @a choice, and @c
- * merged_file to @a merged_file.  Set all other fields to their @c
- * _unknown, @c NULL or invalid value, respectively. Make only a shallow
+ * Set the @c choice field of the structure to @a choice, @c merged_file
+ * to @a merged_file, and @c save_merged to false.  Make only a shallow
  * copy of the pointer argument @a merged_file.
  *
  * @since New in 1.5.

Modified: subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.h?rev=1560875&r1=1560874&r2=1560875&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/conflicts.h Fri Jan 24 01:36:35 2014
@@ -401,14 +401,18 @@ svn_wc__conflict_create_markers(svn_skel
                                 apr_pool_t *result_pool,
                                 apr_pool_t *scratch_pool);
 
-/* Call the interactive conflict resolver RESOLVER_FUNC with RESOLVER_BATON to
-   allow resolving the conflicts on LOCAL_ABSPATH.
+/* Call the conflict resolver RESOLVER_FUNC with RESOLVER_BATON for each
+   of the conflicts on LOCAL_ABSPATH.  Depending on the results that
+   the callback returns, perhaps resolve the conflicts, and perhaps mark
+   them as resolved in the WC DB.
 
    Call RESOLVER_FUNC once for each property conflict, and again for any
    text conflict, and again for any tree conflict on the node.
 
    CONFLICT_SKEL contains the details of the conflicts on LOCAL_ABSPATH.
 
+   Use MERGE_OPTIONS when the resolver requests a merge.
+
    Resolver actions are directly applied to the in-db state of LOCAL_ABSPATH,
    so the conflict and the state in CONFLICT_SKEL must already be installed in
    wc.db. */



Mime
View raw message