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 2012/06/12 16:17:26 UTC

svn commit: r1349368 - /subversion/trunk/subversion/libsvn_wc/merge.c

Author: rhuijben
Date: Tue Jun 12 14:17:26 2012
New Revision: 1349368

URL: http://svn.apache.org/viewvc?rev=1349368&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): Use the right enum to produce no change outcome.

Suggested by: hwright

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

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1349368&r1=1349367&r2=1349368&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue Jun 12 14:17:26 2012
@@ -1555,7 +1555,7 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
       {
         *merge_content_outcome = svn_wc_merge_no_merge;
         if (merge_props_outcome)
-          *merge_props_outcome = svn_wc_merge_no_merge;
+          *merge_props_outcome = svn_wc_notify_state_unchanged;
         return SVN_NO_ERROR;
       }