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 2010/06/25 11:03:56 UTC
svn commit: r957855 - /subversion/trunk/subversion/libsvn_wc/util.c
Author: philip
Date: Fri Jun 25 09:03:56 2010
New Revision: 957855
URL: http://svn.apache.org/viewvc?rev=957855&view=rev
Log:
Fix a compiler warning.
* subversion/libsvn_wc/util.c
(svn_wc__status2_from_3): Check node status rather than node kind.
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=957855&r1=957854&r2=957855&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Fri Jun 25 09:03:56 2010
@@ -678,7 +678,7 @@ svn_wc__status2_from_3(svn_wc_status2_t
&& old_status->conflicted
&& old_status->node_status != svn_wc_status_obstructed
&& (old_status->kind == svn_node_file
- || old_status->kind != svn_wc_status_missing))
+ || old_status->node_status != svn_wc_status_missing))
{
svn_boolean_t text_conflict_p, prop_conflict_p;
Re: svn commit: r957855 -
/subversion/trunk/subversion/libsvn_wc/util.c
Posted by Julian Foad <ju...@wandisco.com>.
philip@apache.org wrote:
> Author: philip
> Date: Fri Jun 25 09:03:56 2010
> New Revision: 957855
>
> URL: http://svn.apache.org/viewvc?rev=957855&view=rev
> Log:
> Fix a compiler warning.
Looks like you fixed a bug, not just a warning!
- Julian
> * subversion/libsvn_wc/util.c
> (svn_wc__status2_from_3): Check node status rather than node kind.
> && (old_status->kind == svn_node_file
> - || old_status->kind != svn_wc_status_missing))
> + || old_status->node_status != svn_wc_status_missing))