You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/03/30 06:00:12 UTC
svn commit: r1669986 - in /subversion/branches/1.9.x: ./ STATUS
subversion/include/svn_wc.h
Author: svn-role
Date: Mon Mar 30 04:00:12 2015
New Revision: 1669986
URL: http://svn.apache.org/r1669986
Log:
Merge r1668603 from trunk:
* r1668603
Fixes to the public svn_wc API documentation.
Justification:
Have a complete, correct and easily accessible API description.
None of these changes should affect generated code nor the ABI.
Votes:
+1: stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/include/svn_wc.h
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 04:00:12 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667106-1667107,1667941,1667976,1668598,1668600,1668602
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1669986&r1=1669985&r2=1669986&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Mon Mar 30 04:00:12 2015
@@ -254,11 +254,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1668603
- Fixes to the public svn_wc API documentation.
- Justification:
- Have a complete, correct and easily accessible API description.
- None of these changes should affect generated code nor the ABI.
- Votes:
- +1: stefan2
Modified: subversion/branches/1.9.x/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_wc.h?rev=1669986&r1=1669985&r2=1669986&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_wc.h Mon Mar 30 04:00:12 2015
@@ -1859,11 +1859,11 @@ 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;
- /* For property conflicts, the absolute path to the .prej file.
+ /** For property conflicts, the absolute path to the .prej file.
* @since New in 1.9. */
const char *prop_reject_abspath;
- /* For property conflicts, the local base value of the property, i.e. the
+ /** For property conflicts, the local base value of the property, i.e. the
* value of the property as of the BASE revision of the working copy.
* For conflicts created during update/switch this contains the
* post-update/switch property value. The pre-update/switch value can
@@ -1872,20 +1872,20 @@ typedef struct svn_wc_conflict_descripti
* @since New in 1.9. */
const svn_string_t *prop_value_base;
- /* For property conflicts, the local working value of the property,
+ /** For property conflicts, the local working value of the property,
* i.e. the value of the property in the working copy, possibly with
* local modiciations.
* Only set if available, so might be @c NULL.
* @since New in 1.9. */
const svn_string_t *prop_value_working;
- /* For property conflicts, the incoming old value of the property,
+ /** For property conflicts, the incoming old value of the property,
* i.e. the value the property had at @c src_left_version.
* Only set if available, so might be @c NULL.
* @since New in 1.9 */
const svn_string_t *prop_value_incoming_old;
- /* For property conflicts, the incoming new value of the property,
+ /** For property conflicts, the incoming new value of the property,
* i.e. the value the property had at @c src_right_version.
* Only set if available, so might be @c NULL.
* @since New in 1.9 */
@@ -3836,8 +3836,8 @@ typedef struct svn_wc_status3_t
svn_boolean_t file_external;
- /** The actual kind of the node in the working copy. May differ from kind
- * on obstructions, deletes, etc. svn_node_unknown if unavailable.
+ /** The actual kind of the node in the working copy. May differ from
+ * @a kind on obstructions, deletes, etc. #svn_node_unknown if unavailable.
*
* @since New in 1.9 */
svn_node_kind_t actual_kind;