svn commit: r1739962 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c tests/cmdline/update_tests.py

[st...@apache.org]

Author: stsp
Date: Tue Apr 19 16:57:54 2016
New Revision: 1739962

URL: http://svn.apache.org/viewvc?rev=1739962&view=rev
Log:
Use the new svn_wc_notify_action_t values for conflicts in more places.

* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_text_mark_resolved,
   svn_wc__conflict_prop_mark_resolved): Use new notifcations for text and
    property conflicts, respectively.

* subversion/tests/cmdline/update_tests.py
  (update_output_with_conflicts): Adjust expected output.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c
    subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1739962&r1=1739961&r2=1739962&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Apr 19 16:57:54 2016
@@ -3367,7 +3367,8 @@ svn_wc__conflict_text_mark_resolved(svn_
 
   if (did_resolve && notify_func)
     notify_func(notify_baton,
-                svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,
+                svn_wc_create_notify(local_abspath,
+                                     svn_wc_notify_resolved_text,
                                      scratch_pool),
                 scratch_pool);
 
@@ -3399,10 +3400,14 @@ svn_wc__conflict_prop_mark_resolved(svn_
                                         NULL, NULL, scratch_pool));
 
   if (did_resolve && notify_func)
-    notify_func(notify_baton,
-                svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,
+    {
+      svn_wc_notify_t *notify;
+      
+      notify = svn_wc_create_notify(local_abspath, svn_wc_notify_resolved_prop,
                                      scratch_pool),
-                scratch_pool);
+      notify->prop_name = propname;
+      notify_func(notify_baton, notify, scratch_pool);
+    }
   return SVN_NO_ERROR;
 }
 

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1739962&r1=1739961&r2=1739962&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Apr 19 16:57:54 2016
@@ -3610,7 +3610,7 @@ def update_output_with_conflicts(rev, ta
   lines += ['Updated to revision %d.\n' % rev]
   if resolved:
     for path in paths:
-      lines += ["Resolved conflicted state of '%s'\n" % path]
+      lines += ["Merge conflicts in '%s' marked as resolved.\n" % path]
     lines += svntest.main.summary_of_conflicts(text_resolved=len(paths))
   else:
     lines += svntest.main.summary_of_conflicts(text_conflicts=len(paths))