[
https://issues.apache.org/jira/browse/SVN-4632?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16130298#comment-16130298
]
Stefan Hett commented on SVN-4632:
----------------------------------
FWIW: I just verified the issue exists with SVN 1.8.14-1.8.17, 1.9.0-1.9.5 and
trunk @1697405-1771118 while SVN 1.7.22 won't trigger a text conflict here.
Further details and repro script available on
http://www.luke1410.de:8090/browse/MAXSVN-109 .
> Conflict on merging eol-syle:native property change only
> --------------------------------------------------------
>
> Key: SVN-4632
> URL: https://issues.apache.org/jira/browse/SVN-4632
> Project: Subversion
> Issue Type: Bug
> Reporter: Andrey Roussev
>
> * make a branch from trunk
> * add eol-style:native attribute to some file in trunk
> * merge that changes into branch
> * in subversion 1.8.x, 1.9.x you will get a conflict, in subversion 1.7.x you
> will not
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
