Author: svn-role
Date: Wed Apr 15 04:00:54 2015
New Revision: 1673632
URL: http://svn.apache.org/r1673632
Log:
Merge r1672311 from trunk:
* r1672311
Fix some doc and pass problems on the deprecated svn_wc_add_from_disk2
Justification:
Simple fix to resolve a case where new properties are lost on add.
Notes:
Regression from 1.8 for API users.
Votes:
+1: rhuijben, danielsh, philip
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/include/svn_wc.h
subversion/branches/1.9.x/subversion/libsvn_wc/deprecated.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:00:54 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,1667235,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670139,1670149,1670152,1670329,1670347,1670353,1671388,1672511-1672512,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,1667235,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670139,1670149,1670152,1670329,1670347,1670353,1671388,1672311,1672511-1672512,1672728
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1673632&r1=1673631&r2=1673632&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr 15 04:00:54 2015
@@ -235,15 +235,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1672311
- Fix some doc and pass problems on the deprecated svn_wc_add_from_disk2
- Justification:
- Simple fix to resolve a case where new properties are lost on add.
- Notes:
- Regression from 1.8 for API users.
- Votes:
- +1: rhuijben, danielsh, philip
-
* r1672372, r1672404
Stop parsing the result of a succeeded PUT as xml error chain
Justification:
@@ -345,4 +336,3 @@ Approved changes:
Error leaks are bad and no reason to leave them unfixed.
Votes:
+1: breser, philip, 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=1673632&r1=1673631&r2=1673632&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_wc.h Wed Apr 15 04:00:54
2015
@@ -4675,7 +4675,7 @@ svn_wc_add_from_disk3(svn_wc_context_t *
/**
* Similar to svn_wc_add_from_disk3(), but always passes FALSE for
- * @a skip_som_prop_canon
+ * @a skip_checks
*
* @since New in 1.8.
* @deprecated Provided for backward compatibility with the 1.8 API.
Modified: subversion/branches/1.9.x/subversion/libsvn_wc/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_wc/deprecated.c?rev=1673632&r1=1673631&r2=1673632&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_wc/deprecated.c Wed Apr 15
04:00:54 2015
@@ -948,12 +948,12 @@ svn_wc_delete(const char *path,
svn_error_t *
svn_wc_add_from_disk2(svn_wc_context_t *wc_ctx,
const char *local_abspath,
- const apr_hash_t *props,
+ const apr_hash_t *props,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool)
{
- SVN_ERR(svn_wc_add_from_disk3(wc_ctx, local_abspath, NULL, FALSE,
+ SVN_ERR(svn_wc_add_from_disk3(wc_ctx, local_abspath, props, FALSE,
notify_func, notify_baton, scratch_pool));
return SVN_NO_ERROR;
}
