db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Dyre Tjeldvoll (JIRA)" <j...@apache.org>
Subject [jira] [Comment Edited] (DERBY-5979) ant release target creates a release.properties that has conflicting line endings so automatic checkin fails
Date Mon, 01 Jul 2013 14:54:20 GMT

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

Dyre Tjeldvoll edited comment on DERBY-5979 at 7/1/13 2:52 PM:
---------------------------------------------------------------

Thanks for the review, Knut. Attaching derby-5979-2.diff which hopefully will have the entire
change as well as removing the extra variable. The patch also changes the derby.junit.jvm
property form "java" to "${java.home}/bin/java" in build.xml.
                
      was (Author: dyret):
    Thanks for the review, Knut. Attaching derby-5979.diff which hopefully will have the entire
change as well as removing the extra variable. The patch also changes the derby.junit.jvm
property form "java" to "${java.home}/bin/java" in build.xml.
                  
> 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
>            Assignee: Dyre Tjeldvoll
>              Labels: derby_triage10_11
>         Attachments: derby-5979-1.diff, derby-5979-2.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

Mime
View raw message