subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1139275 - in /subversion/trunk/subversion: libsvn_client/revert.c tests/cmdline/revert_tests.py
Date Fri, 24 Jun 2011 12:38:45 GMT
Author: danielsh
Date: Fri Jun 24 12:38:45 2011
New Revision: 1139275

URL: http://svn.apache.org/viewvc?rev=1139275&view=rev
Log:
Fix for issue #3938: Make 'svn revert' skip unversioned targets.

* subversion/libsvn_client/revert.c
  (revert): Send 'skip' notification when svn_wc_revert4() returns
    SVN_ERR_WC_PATH_NOT_FOUND.

* subversion/tests/cmdline/revert_tests.py
  (revert_with_unversioned_targets): Expect it to pass.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

Modified:
    subversion/trunk/subversion/libsvn_client/revert.c
    subversion/trunk/subversion/tests/cmdline/revert_tests.py

Modified: subversion/trunk/subversion/libsvn_client/revert.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/revert.c?rev=1139275&r1=1139274&r2=1139275&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/revert.c (original)
+++ subversion/trunk/subversion/libsvn_client/revert.c Fri Jun 24 12:38:45 2011
@@ -91,7 +91,8 @@ revert(void *baton, apr_pool_t *result_p
       /* If target isn't versioned, just send a 'skip'
          notification and move on. */
       if (err->apr_err == SVN_ERR_ENTRY_NOT_FOUND
-          || err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE)
+          || err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE
+          || err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
         {
           if (b->ctx->notify_func2)
             (*b->ctx->notify_func2)

Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1139275&r1=1139274&r2=1139275&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Jun 24 12:38:45 2011
@@ -1548,7 +1548,6 @@ def revert_no_text_change_conflict_recur
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-@XFail()
 @Issue(3938)
 def revert_with_unversioned_targets(sbox):
   "revert with unversioned targets"



Mime
View raw message