Re: [PATCH] possible fix for issue 565

ack, i sent the wrong version of the diff... here is the current one,
updated to account for the recent changes to the python tests.

-garrett

Index: ./subversion/libsvn_subr/target.c
===================================================================
--- ./subversion/libsvn_subr/target.c
+++ ./subversion/libsvn_subr/target.c Wed Jan 16 20:23:13 2002
@@ -97,6 +97,8 @@
                            const apr_array_header_t *targets,
                            apr_pool_t *pool)
 {
+ svn_error_t *err;
+
   if (targets->nelts <=0)
     {
       *pbasedir = NULL;
@@ -221,14 +223,15 @@
         }
       
       /* Finally check if pbasedir is a dir or a file. */
- SVN_ERR (svn_path_split_if_file (*pbasedir, pbasedir, &file, pool));
- if ((pcondensed_targets != NULL)
- && (! svn_path_is_empty (file)))
- {
- /* If there was just one target, and it was a file, then
- return it as the sole condensed target. */
- (*((svn_stringbuf_t**)apr_array_push (*pcondensed_targets))) = file;
- }
+ err = svn_path_split_if_file (*pbasedir, pbasedir, &file, pool);
+ if (err == SVN_NO_ERROR)
+ if ((pcondensed_targets != NULL)
+ && (! svn_path_is_empty (file)))
+ {
+ /* If there was just one target, and it was a file, then
+ return it as the sole condensed target. */
+ (*((svn_stringbuf_t**)apr_array_push (*pcondensed_targets))) = file;
+ }
     }
   
   return SVN_NO_ERROR;
Index: ./subversion/tests/clients/cmdline/commit_tests.py
===================================================================
--- ./subversion/tests/clients/cmdline/commit_tests.py
+++ ./subversion/tests/clients/cmdline/commit_tests.py Thu Jan 17 18:43:04 2002
@@ -1213,6 +1213,27 @@
 
   return 0
 
+def commit_rmd_and_deleted_file(sbox):
+ "commit a single file that has been both svn rm'd and actually deleted"
+
+ if sbox.build():
+ return 1
+
+ wc_dir = sbox.wc_dir
+
+ mu_path = os.path.join(wc_dir, 'A', 'mu')
+
+ svntest.main.run_svn(None, 'rm', mu_path)
+
+ os.unlink(mu_path)
+
+ out, err = svntest.main.run_svn(None, 'commit', mu_path)
+
+ if len(err) != 0:
+ return 1
+
+ return 0
+
 ########################################################################
 # Run the tests
 
@@ -1236,6 +1257,7 @@
               commit_uri_unsafe,
               commit_deleted_edited,
               commit_in_dir_scheduled_for_addition,
+ commit_rmd_and_deleted_file,
              ]
 
 if __name__ == '__main__':

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org