On Wed, Oct 22, 2008 at 14:52, Bogdan Cristea <cristeab_at_gmail.com> wrote:
> This could be indeed an explanation, the development environment is
> mixed between Windows and Linux.
> Is there a way to be sure that all submitted files use the same line endings ?
Unless you have a need for specific line endings in your files,
svn:eol-style set to native can help alleviate a lot of the trouble.
As can using editors on Windows which have a clue about non-Windows EOL markers.
> On Wed, Oct 22, 2008 at 9:04 PM, Tyler Roscoe <tyler_at_cryptio.net> wrote:
>> On Wed, Oct 22, 2008 at 03:20:04PM +0300, Bogdan Cristea 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?
>>
>> Is it possible you are getting conflicts because of whitespace/line
>> endings issues? Do you have a mixed development environment (Windows +
>> UNIX)?
>>
>> tyler
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: users-help_at_subversion.tigris.org
>>
>>
>
>
>
> --
> Bogdan Cristea
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>
---------------------------------------------------------------------
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-22 20:54:33 CEST