You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/30 11:25:50 UTC

svn commit: r1440333 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rhuijben
Date: Wed Jan 30 10:25:50 2013
New Revision: 1440333

URL: http://svn.apache.org/viewvc?rev=1440333&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_file_changed): Read local variable instead of output variable.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1440333&r1=1440332&r2=1440333&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 30 10:25:50 2013
@@ -1845,7 +1845,7 @@ merge_file_changed(svn_wc_notify_state_t
                             scratch_pool));
 
       if (content_outcome == svn_wc_merge_conflict
-          || *prop_state == svn_wc_notify_state_conflicted)
+          || property_state == svn_wc_notify_state_conflicted)
         {
           alloc_and_store_path(&merge_b->conflicted_paths, local_abspath,
                                merge_b->pool);