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

Re: Merge handles svn:eol-style wrongly

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 05 Sep 2008 12:08:47 +0100

On Thu, 2008-09-04 at 15:09 -0700, David Glasser wrote:
> One fix was r30756. This never really got much review and hopefully is correct.

(r30756 was a fix just like this one, but in a call to
svn_subst_copy_and_translate3().)

> Index: subversion/libsvn_wc/merge.c
> ===================================================================
> --- subversion/libsvn_wc/merge.c (revision 31453)
> +++ subversion/libsvn_wc/merge.c (working copy)
> @@ -208,7 +208,7 @@ detranslate_wc_file(const char **detranslated_file
> SVN_ERR(svn_subst_translate_to_normal_form(merge_target,
> detranslated,
> style,
> - eol, eol ? FALSE : TRUE,
> + eol, TRUE,
> keywords,
> special,
> pool));

Thanks, David. This makes my test pass. Committed in 32913.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-05 13:09:03 CEST

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