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

Re: svn commit: r37795 - in trunk/subversion: svnsync tests/cmdline tests/cmdline/svnsync_tests_data

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 23 May 2009 15:24:22 +0300 (Jerusalem Daylight Time)

Neels Janosch Hofmeyr wrote on Fri, 22 May 2009 at 19:54 -0700:
> Author: neels
> Date: Fri May 22 19:54:22 2009
> New Revision: 37795
>
> Log:
> Fix issue #3404: Normalize line endings in svn:* props during svnsync.
> Always automatically convert all svn:* properties to LF line ending style,
> and notify about all normalizations collectively after all else is done.
>

Thanks for taking this fix in!

Reviewing for backport, it looks good, modulo four places that miss an
SVN_ERR() wrap:

> * subversion/svnsync/main.c
> (normalize_string, normalize_revprops, log_properties_normalized):
> Add functions.

> @@ -684,7 +787,10 @@ do_initialize(svn_ra_session_t *to_sessi
> + /* Notify about normalized props, if any. */
> + log_properties_normalized(normalized_rev_props_count, 0, pool);
>

One,

> @@ -1016,6 +1123,15 @@ change_file_prop(void *file_baton,
> + /* Normalize svn:* properties as necessary. */
> + if (svn_prop_needs_translation(name))
> + {
> + svn_boolean_t was_normalized;
> + normalize_string(&value, &was_normalized, pool);

two,

> @@ -1104,6 +1220,16 @@ change_dir_prop(void *dir_baton,
> + /* Normalize svn:* properties as necessary. */
> + if (svn_prop_needs_translation(name))
> + {
> + svn_boolean_t was_normalized;
> + normalize_string((const svn_string_t**)&real_value,
> + &was_normalized, pool);

three,

> @@ -1706,11 +1863,16 @@ do_copy_revprops(svn_ra_session_t *to_se
> + /* Notify about normalized props, if any. */
> + log_properties_normalized(normalized_rev_props_count, 0, pool);
> +
> return SVN_NO_ERROR;
> }

four.

I'll go and vote in STATUS now.

Thanks (and sorry that I didn't have time to fix it myself),

Daniel

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2353148
Received on 2009-05-23 14:24:59 CEST

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