[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: David Glasser <glasser_at_davidglasser.net>
Date: Thu, 4 Sep 2008 15:09:36 -0700

One fix was r30756. This never really got much review and hopefully is correct.

Embarrassingly, I only sent the other (unreviewed) patch to coworkers
at Google rather than dev@; oops. (We ran into these problems a *lot*
with a certain Windows project you may have heard of.) Here's the
unreviewed patch:

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));

--dave

On Thu, Sep 4, 2008 at 3:04 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> I found a couple problems like this months ago, and committed at least
> one fix; other patches languished unreviewed. Let me see if I can dig
> them up.
>
> --dave
>
> On Thu, Sep 4, 2008 at 12:57 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
>> On Thu, 2008-09-04 at 18:09 +0100, Julian Foad wrote:
>>> I will write a test for this problem if no-one beats me to it.
>>
>> It's merge_tests.py 107, added in r32907.
>>
>> [[[
>> Add a test for a problem whereby a merge fails with the error
>> "Inconsistent line ending style" if the source change consists of
>> unifying the EOL style and then setting svn:eol-style=native.
>>
>> * subversion/tests/cmdline/merge_tests.py
>> (svn_merge): Allow a revision specifier string as an alternative to a
>> single revision number.
>> (merge_an_eol_unification_and_set_svn_eol_style): New test function.
>> (test_list): Add the new test.
>> ]]]
>>
>> It's XFail.
>>
>> - Julian
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>>
>>
>
>
>
> --
> David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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 00:09:54 CEST

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