On Fri, Oct 24, 2008 at 07:52, Bogdan Cristea <cristeab_at_gmail.com> wrote:
> On Wednesday 22 October 2008 15:20:04 you wrote:
>> I have a mixed c,c++ and java source files in two different branches.
>> I have done a checkout from one branch, then I have used svn merge
>> svn://other/branch, but 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 even if in reality only several lines
>> differ. This issue is annoying when the file is large and one needs only to
>> see the lines where the two file versions differ. Is there a way to solve
>> this issue?
>> regards
>
> 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.
---------------------------------------------------------------------
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-24 14:45:00 CEST