You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/10/29 12:59:50 UTC
svn commit: r1403258 - /subversion/trunk/subversion/libsvn_wc/util.c
Author: philip
Date: Mon Oct 29 11:59:49 2012
New Revision: 1403258
URL: http://svn.apache.org/viewvc?rev=1403258&view=rev
Log:
Fix incorrect status returned by the 1.6 API.
Found by: Sean Farrell <sfarrell{_AT_}wv.mentorg.com>
* subversion/libsvn_wc/util.c
(svn_wc__status2_from_3): Set correct text status.
Modified:
subversion/trunk/subversion/libsvn_wc/util.c
Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=1403258&r1=1403257&r2=1403258&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Mon Oct 29 11:59:49 2012
@@ -469,7 +469,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 */