RE: Two-step merge ok, one-step merge conflicts

> -----Original Message-----
> From: Timur Khanipov [mailto:khanipov_at_gmail.com]
> Sent: Wednesday, August 19, 2015 1:20 PM
> To: users_at_subversion.apache.org
> Cc: Иван Коптелов
> Subject: Two-step merge ok, one-step merge conflicts
>
> Hi folks.
>
> I faced the following problem. The command
> svn merge -r 3:4 -r 4:5 ^^/trunk
> works smoothly while command
> svn merge -r 3:5 ^^/trunk
> results in a text conflict. This seems like a buggy behavior (since the two merges are equivalent).

Same behavior in 1.8.10 (r1615264) on windows.

However, if you change the svn:eol-style to "CRLF", them "merge -r 3:5" works without a conflict.

It looks like "native" with the "merge -r 3:5" causes a conflict because of eol changes to the file in the middle of the merge process? Also note, that with "native" the merge conflict appears to be with the EOLs and not with the text change you made.
Received on 2015-08-19 20:19:59 CEST