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

I also think I might need to include a similar change to
detranslate_wc_file, since a user reported a similar problem that
wasn't fixed by this commit, but which making the following change did
fix.

Can somebody please review these?

--dave

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

On Fri, May 30, 2008 at 1:40 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> Bah, nobody reviewed this? This was a nasty bug that caught a bunch
> of my users. Can somebody review this so we can get it in 1.5.1?
>
> --dave
>
> On Tue, Apr 22, 2008 at 3:25 PM, David Glasser <glasser_at_davidglasser.net> wrote:
>> I am not a subst expert, but this patch fixes a real problem that was
>> preventing my users from getting work done.
>>
>> I think it should go in 1.5, but would appreciate review by somebody
>> more familiar with what's going on here to make sure there aren't any
>> negative consequences.
>>
>> --dave
>>
>> On Tue, Apr 22, 2008 at 12:15 PM, <glasser_at_tigris.org> wrote:
>>> Author: glasser
>>> Date: Tue Apr 22 12:15:29 2008
>>> New Revision: 30756
>>>
>>> Log:
>>> Allow 'svn merge' to merge diffs which add 'svn:eol-style' properties
>>> to files that used to have inconsistent newlines.
>>>
>>> Specifically, if the diff being applied adds an 'svn:eol-style'
>>> property to a file, then the left file gets converted to the new EOL
>>> style before running diff3. If that left file (ie, an old repository
>>> file) had inconsistent newlines, then svn errored out with a useless
>>> "svn: File '/tmp/tmp' has inconsistent newlines", and there was
>>> basically no recourse. So let it repair newlines.
>>>
>>> * subversion/libsvn_wc/merge.c
>>> (maybe_update_target_eols): Repair newlines when translating 'left'
>>> file in a merge.
>>>
>>> Modified:
>>> trunk/subversion/libsvn_wc/merge.c
>>>
>>> Modified: trunk/subversion/libsvn_wc/merge.c
>>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/merge.c?pathrev=30756&r1=30755&r2=30756
>>> ==============================================================================
>>> --- trunk/subversion/libsvn_wc/merge.c Tue Apr 22 11:43:48 2008 (r30755)
>>> +++ trunk/subversion/libsvn_wc/merge.c Tue Apr 22 12:15:29 2008 (r30756)
>>> @@ -245,7 +245,7 @@ maybe_update_target_eols(const char **ne
>>> pool));
>>> SVN_ERR(svn_subst_copy_and_translate3(old_target,
>>> tmp_new,
>>> - eol, eol ? FALSE : TRUE,
>>> + eol, TRUE,
>>> NULL, FALSE,
>>> FALSE, pool));
>>> *new_target = tmp_new;
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
>>> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>>>
>>>
>>
>>
>>
>> --
>> David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
>>
>
>
>
> --
> 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