subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r906018 - in /subversion/trunk/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py
Date Wed, 03 Feb 2010 12:02:36 GMT
Author: stsp
Date: Wed Feb  3 12:02:35 2010
New Revision: 906018

URL: http://svn.apache.org/viewvc?rev=906018&view=rev
Log:
* subversion/libsvn_client/patch.c
  (maybe_send_patch_notification): Only report a target as 'missing'
   if its parent directory exists but the target does not. Otherwise,
   the target isn't really missing, but something else is in the way,
   like an unversioned or deleted file or directory.

* subversion/tests/cmdline/patch_tests.py
  (patch_add_new_dir): Adjust expected output.

Modified:
    subversion/trunk/subversion/libsvn_client/patch.c
    subversion/trunk/subversion/tests/cmdline/patch_tests.py

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=906018&r1=906017&r2=906018&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Feb  3 12:02:35 2010
@@ -969,8 +969,8 @@
 
   if (action == svn_wc_notify_skip)
     {
-      if (target->kind == svn_node_none ||
-          target->kind == svn_node_unknown)
+      if (target->parent_dir_exists &&
+          (target->kind == svn_node_none || target->kind == svn_node_unknown))
         notify->content_state = svn_wc_notify_state_missing;
       else if (target->kind == svn_node_dir)
         notify->content_state = svn_wc_notify_state_obstructed;

Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=906018&r1=906017&r2=906018&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Wed Feb  3 12:02:35 2010
@@ -872,7 +872,7 @@
     'A         %s\n' % os.path.join(wc_dir, 'X'),
     'A         %s\n' % os.path.join(wc_dir, 'X', 'Y'),
     'A         %s\n' % os.path.join(wc_dir, 'X', 'Y', 'new'),
-    'Skipped missing target: \'%s\'\n' % A_C_Y_new_path,
+    'Skipped \'%s\'\n' % A_C_Y_new_path,
     'Summary of conflicts:\n',
     '  Skipped paths: 1\n',
   ]



Mime
View raw message