You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-dev@db.apache.org by "Dyre Tjeldvoll (JIRA)" <ji...@apache.org> on 2013/07/01 09:06:20 UTC

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

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

Dyre Tjeldvoll edited comment on DERBY-5979 at 7/1/13 7:06 AM:
---------------------------------------------------------------

Patch derby-5979-1.diff fixes the hard-coded LF-line endings in the Apache licence String constant. Also adds basedir to the properties.dir property to make it absolute.
                
      was (Author: dyret):
    Fixes the hard-coded LF-line endings in the Apache licence String constant. Also adds basedir to the properties.dir property to make it absolute.
                  
> 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