subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1619080 - /subversion/trunk/subversion/include/svn_wc.h
Date Wed, 20 Aug 2014 12:03:24 GMT
Author: stsp
Date: Wed Aug 20 12:03:24 2014
New Revision: 1619080

URL: http://svn.apache.org/r1619080
Log:
Remove a typedef which I added in r1618906 but which isn't going to be
used very soon after all.

* subversion/include/svn_wc.h
  (svn_wc_conflict_description_private_t): Remove.
  (svn_wc_conflict_description2_t): Remove 'priv' field, and document
   how to extend this structure.


Modified:
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1619080&r1=1619079&r2=1619080&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Aug 20 12:03:24 2014
@@ -1749,10 +1749,6 @@ svn_wc_conflict_version_dup(const svn_wc
                             apr_pool_t *pool);
 
 
-/* Extended conflict information. */
-typedef struct svn_wc_conflict_description_private_t
-  svn_wc_conflict_description_private_t;
-
 /** A struct that describes a conflict that has occurred in the
  * working copy.
  *
@@ -1861,11 +1857,12 @@ typedef struct svn_wc_conflict_descripti
   /** Info on the "merge-right source" or "their" version of incoming change. */
   const svn_wc_conflict_version_t *src_right_version;
 
-  /* Extended conflict information. */
-  svn_wc_conflict_description_private_t *priv;
-
-  /* Instead of adding new fields here, add new fields to the above
-   * 'priv' structure and provide accesstor functions for them. */
+  /* NOTE: Add new fields at the end to preserve binary compatibility.
+     Also, if you add fields here, you have to update
+     svn_wc_conflict_description2_dup and perhaps
+     svn_wc_conflict_description_create_text2,
+     svn_wc_conflict_description_create_prop2, and
+     svn_wc_conflict_description_create_tree2. */
 } svn_wc_conflict_description2_t;
 
 



Mime
View raw message