On Oct 24, 2008, at 07:50, Bogdan Cristea wrote:
> On Friday 24 October 2008 15:44:42 you wrote:
>
>> On Fri, Oct 24, 2008 at 07:52, Bogdan Cristea wrote:
>>
>>> I have tried to change the svn:eol-style property to native in both
>>> branches, but still when the svn client discovers a conflict between
>>> different versions of the same file (for example a java file) the
>>> entire
>>> file content is marked as different. Are there any solutions to
>>> get only
>>> the exact lines where the two versions differ when pushing
>>> 'e' (edit)?
>>> BTW I use svn 1.5.3
>>
>> Simply setting the property isn't enough. If you have mixed line
>> endings, there will still be problems; you need to set the property
>> AND correct the line endings the first time.
>
> Suversion book says:
>
>> This causes the file to contain the EOL markers that are native to
>> the
>> operating system on which Subversion was run. In other words, if a
>> user on a
>> Windows machine checks out a working copy that contains a file
>> with an
>> svn:eol-style property set to native, that file will contain CRLF EOL
>> markers. A Unix user checking out a working copy that contains the
>> same file
>> will see LF EOL markers in his copy of the file.
>
>
> So if both braches have svn:eol-style set to native, a merge should
> work with
> native EOLs. Am I wrong?
It may be that if the changes you're merging happened before you set
svn:eol-style (as they did in your case), then Subversion can't do
the merge right. You may have to do this merge manually (I mean,
resolve the conflicts manually). Any merges of changes made after
svn:eol-style was set correctly should work properly.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-25 00:03:17 CEST