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/03/11 15:30:47 UTC

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

Author: rhuijben
Date: Mon Mar 11 14:30:46 2013
New Revision: 1455163

URL: http://svn.apache.org/r1455163
Log:
* subversion/libsvn_client/merge.c
  (mark_dir_edited): Produce the right notify kind.

Found by: philip.

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=1455163&r1=1455162&r2=1455163&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Mar 11 14:30:46 2013
@@ -1595,7 +1595,7 @@ mark_dir_edited(merge_cmd_baton_t *merge
                             local_abspath,
                             (db->tree_conflict_reason == CONFLICT_REASON_SKIP)
                                 ? svn_wc_notify_skip
-                                : svn_wc_notify_state_obstructed,
+                                : svn_wc_notify_update_skip_obstruction,
                             scratch_pool);
           notify->kind = svn_node_dir;
           notify->content_state = notify->prop_state = db->skip_reason;