Author: svn-role
Date: Sun Apr 12 04:00:51 2015
New Revision: 1672978
URL: http://svn.apache.org/r1672978
Log:
Merge r1672512 from trunk:
* r1672512
Correct docstrings for 1.9 functions in svn_wc.h
Justification:
Have a complete, correct and easily accessible API description.
Notes:
Docstring-only patch. Acceptable with a single vote.
Via IRC, Bert gave his o.k. for the /trunk change.
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 Sun Apr 12 04:00:51 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,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670329,1670353,1671388,1672511,1672728
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670329,1670353,1671388,1672511-1672512,1672728
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1672978&r1=1672977&r2=1672978&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Sun Apr 12 04:00:51 2015
@@ -259,13 +259,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1672512
- Correct docstrings for 1.9 functions in svn_wc.h
- Justification:
- Have a complete, correct and easily accessible API description.
- Notes:
- Docstring-only patch. Acceptable with a single vote.
- Via IRC, Bert gave his o.k. for the /trunk change.
- 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=1672978&r1=1672977&r2=1672978&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_wc.h Sun Apr 12 04:00:51
2015
@@ -2104,7 +2104,7 @@ svn_wc_conflict_description_create_tree(
/** Return a duplicate of @a conflict, allocated in @a result_pool.
* A deep copy of all members will be made.
*
- * @since New in 1.7.
+ * @since New in 1.9.
*/
svn_wc_conflict_description2_t *
svn_wc_conflict_description2_dup(
@@ -4657,6 +4657,9 @@ svn_wc_delete(const char *path,
* If @a local_abspath does not exist as file, directory or symlink, return
* #SVN_ERR_WC_PATH_NOT_FOUND.
*
+ * If @a notify_func is non-NULL, invoke it with @a notify_baton to report
+ * the item being added.
+ *
* ### TODO: Split into add_dir, add_file, add_symlink?
*
* @since New in 1.9.
@@ -7304,6 +7307,12 @@ svn_wc_get_pristine_copy_path(const char
* points during the operation. If it returns an error (typically
* #SVN_ERR_CANCELLED), return that error immediately.
*
+ * If @a notify_func is non-NULL, invoke it with @a notify_baton to report
+ * the progress of the operation.
+ *
+ * @note In 1.9, @a notify_func does not get called at all. This may change
+ * in later releases.
+ *
* @since New in 1.9.
*/
svn_error_t *
