svn commit: r1706729 - in /subversion/trunk/subversion: svn/notify.c tests/cmdline/patch_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Sun Oct  4 21:30:49 2015
New Revision: 1706729

URL: http://svn.apache.org/viewvc?rev=1706729&view=rev
Log:
Following up on r1706693, tweak notifications on obstructed targets during
'svn patch'.

* subversion/svn/notify.c
  (notify_body): Add specialized notification for unversioned obstructions
    during skip.

* subversion/tests/cmdline/patch_tests.py
  (patch_symlink_traversal): Tweak skip kind. Don't produce unnecessary
    exact expected output.

Modified:
    subversion/trunk/subversion/svn/notify.c
    subversion/trunk/subversion/tests/cmdline/patch_tests.py

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1706729&r1=1706728&r2=1706729&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Sun Oct  4 21:30:49 2015
@@ -253,6 +253,13 @@ notify_body(struct notify_baton *nb,
                     _("Skipped target: '%s' -- copy-source is missing\n"),
                     path_local));
         }
+      else if (n->content_state == svn_wc_notify_state_obstructed)
+        {
+          SVN_ERR(svn_cmdline_printf(
+                    pool,
+                    _("Skipped '%s' -- obstructed by unversioned node\n"),
+                    path_local));
+        }
       else
         {
           SVN_ERR(svn_cmdline_printf(pool, _("Skipped '%s'\n"), path_local));

Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1706729&r1=1706728&r2=1706729&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sun Oct  4 21:30:49 2015
@@ -5574,9 +5574,8 @@ def patch_symlink_traversal(sbox):
   patch_file_path = sbox.get_tempname('my.patch')
   svntest.main.file_write(patch_file_path, unidiff_patch)
 
-  expected_output = [
-    'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/E/unversioned'),
-  ] + svntest.main.summary_of_conflicts(skipped_paths=1)
+  expected_output = wc.State(wc_dir, {
+  })
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.add({'A/B/E/unversioned' : Item(contents=alpha_contents)})
   expected_disk.add({'A/B/E/versioned' : Item(contents=alpha_contents)})
@@ -5586,7 +5585,7 @@ def patch_symlink_traversal(sbox):
   expected_status.add({'A/B/E/versioned' : Item(status='A ', wc_rev='-')})
   expected_status.add({'A/B/versioned' : Item(status='A ', wc_rev='-')})
   expected_skip = wc.State('', {
-    sbox.ospath('A/B/E/unversioned') : Item(verb='Skipped missing target'),
+    sbox.ospath('A/B/E/unversioned') : Item(verb='Skipped'),
   })
   svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
                                        expected_output, expected_disk,