You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by makl <ma...@tigris.org> on 2004/04/10 08:07:34 UTC

Re: [PATCH] Fix for issue 1797 - take four

[[[
Fix for issue 1797. non-recursive delete of directory tree fails

Patch from <ma...@tigris.org>

* subversion/include/svn_wc.h
       Add new function svn_wc_adm_extend.

* subversion/libsvn_wc/lock.c
       (do_open): Allow locking of directories that are already locked.
       (svn_wc_adm_open2):
       (svn_wc__adm_pre_open):
          Add the new parameters to the call of do_open.
       (svn_wc_adm_extend): New function. This function is similar to
       svn_wc_adm_open2 but doesn't return a SVN_ERR_WC_LOCKED error if
       the directory has already a lock in associated.

* subversion/libsvn_client/commit.c
       (svn_client_commit): Always lock deleted directories recursive.

* subversion/libsvn_client/commit_util.c
       (svn_client__do_commit): Remove any deleted entries where the parent
       is deleted too.

* subversion/tests/clients/cmdline/commit_tests.py
       (commit_deleted_directory_tree_non_recursive_1): New
       regression test for case one.
       (commit_deleted_directory_tree_non_recursive_2_1): New
       regression test for case two with one deleted directory.
       (commit_deleted_directory_tree_non_recursive_2_1): New
       regression test for case two with three independent deleted
       directories.
]]]