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 2022/11/07 04:00:05 UTC
svn commit: r1905109 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_wc/deprecated.c
Author: svn-role
Date: Mon Nov 7 04:00:05 2022
New Revision: 1905109
URL: http://svn.apache.org/viewvc?rev=1905109&view=rev
Log:
Merge r1904193 from trunk:
* r1904193
SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t
Justification:
Allow PySVN (and other deprecated API users) to detect working copy
locked status.
Votes:
+1: hartmannathan, rhuijben, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1904193
Merged /subversion/branches/issue-4908:r1903812-1904192
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905109&r1=1905108&r2=1905109&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:05 2022
@@ -64,14 +64,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1904193
- SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t
- Justification:
- Allow PySVN (and other deprecated API users) to detect working copy
- locked status.
- Votes:
- +1: hartmannathan, rhuijben, jamessan
-
* r1904936
Add @Deprecated decorations to avoid compiler warnings.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c?rev=1905109&r1=1905108&r2=1905109&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c Mon Nov 7 04:00:05 2022
@@ -2799,6 +2799,7 @@ svn_wc__status2_from_3(svn_wc_status2_t
}
(*status)->entry = entry;
+ (*status)->locked = old_status->locked;
(*status)->copied = old_status->copied;
(*status)->repos_lock = svn_lock_dup(old_status->repos_lock, result_pool);