[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r25822 - trunk/subversion/libsvn_wc

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-07-24 07:40:13 CEST

This broke 'special_tests.py 7', We need a solution which will work
for both cases.

On Jul 23, 2007, at 1:58 PM, dlr@tigris.org wrote:

> Author: dlr
> Date: Mon Jul 23 13:58:42 2007
> New Revision: 25822
>
> Log:
> Fix busted administrative prop file handling with
> 'svn mv a b; svn ps name val b; svn mv b a'.
>
> * subversion/libsvn_wc/update_editor.c
> (svn_wc_add_repos_file2): For schedule-delete files that have no
> (destination) base properties file create an empty base props file
> in the .svn/tmp/ directory.
>
> Patch by: dionisos
> me
>
>
> Modified:
> trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/
> update_editor.c?pathrev=25822&r1=25821&r2=25822
> ======================================================================
> ========
> --- trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ trunk/subversion/libsvn_wc/update_editor.c Mon Jul 23 13:58:42
> 2007
> @@ -3264,8 +3264,8 @@
> apr_hash_t *empty_hash = apr_hash_make(pool);
> const char *propfile_path;
>
> - SVN_ERR(svn_wc__prop_path(&propfile_path, base_name,
> - svn_node_file, TRUE,
> pool));
> + SVN_ERR(svn_wc__prop_base_path(&propfile_path, base_name,
> + svn_node_file, TRUE, pool));
>
> SVN_ERR(svn_wc__save_prop_file(svn_path_join(full_path,
> propfile_path,

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 24 07:33:21 2007

This is an archived mail posted to the Subversion Dev mailing list.