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 2012/11/09 05:01:07 UTC
svn commit: r1407352 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/util.c
Author: svn-role
Date: Fri Nov 9 04:01:06 2012
New Revision: 1407352
URL: http://svn.apache.org/viewvc?rev=1407352&view=rev
Log:
Merge r1403258 from trunk:
* r1403258
Fix incorrect status returned by the 1.6 API.
Justification:
Regression for users of the 1.6 API.
Votes:
+1: philip, rhuijben, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1403258
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1407352&r1=1407351&r2=1407352&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Nov 9 04:01:06 2012
@@ -94,10 +94,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1403258
- Fix incorrect status returned by the 1.6 API.
- Justification:
- Regression for users of the 1.6 API.
- Votes:
- +1: philip, rhuijben, cmpilato
-
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/util.c?rev=1407352&r1=1407351&r2=1407352&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/util.c Fri Nov 9 04:01:06 2012
@@ -463,7 +463,7 @@ svn_wc__status2_from_3(svn_wc_status2_t
/* (Currently a no-op, but just make sure it is ok) */
if (old_status->repos_node_status == svn_wc_status_modified
|| old_status->repos_node_status == svn_wc_status_conflicted)
- (*status)->text_status = old_status->repos_text_status;
+ (*status)->repos_text_status = old_status->repos_text_status;
if (old_status->node_status == svn_wc_status_added)
(*status)->prop_status = svn_wc_status_none; /* No separate info */