[jira] [Commented] (DERBY-5979) ant release target creates a release.properties that has conflicting line endings so automatic checkin fails

["Knut Anders Hatlen (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/DERBY-5979?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13696637#comment-13696637 ] 

Knut Anders Hatlen commented on DERBY-5979:
-------------------------------------------

Thanks, Dyre. You mentioned some changes to the properties.dir property, but I can't find them in the patch (only the changes to ReleaseProperties.java are there).

I think the changes look good. In order to clear up the potential confusion of having two constants with almost the same name, what about collapsing them to a single constant declared like this:

private static final String APACHE_LICENSE_HEADER = (
        "# Licensed to the Apache Software Foundation (ASF) under one or more\n" +
        ...
        "\n").replace('\n', ...);
                
> ant release target creates a release.properties that has conflicting line endings so automatic checkin fails
> ------------------------------------------------------------------------------------------------------------
>
>                 Key: DERBY-5979
>                 URL: https://issues.apache.org/jira/browse/DERBY-5979
>             Project: Derby
>          Issue Type: Bug
>          Components: Build tools
>            Reporter: Kathey Marsden
>              Labels: derby_triage10_11
>         Attachments: derby-5979-1.diff
>
>
> The ant release target  on Windows  creates release.properties with inconsistent line endings that prevent checkin.
> This may be a configuration issue.  I have *.properties = svn:eol-style=native which I think is correct but I could not diff or checkin the file until I removed the dos line endings.  There are similar issues with the release notes but because they are not checked in as part of the a script we document how to fix them up.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira