Re: EOL errors when using merge

Jackson, Paul A. wrote:
> I am encountering problems with conflicting EOL characters when merging
> from Trunk to a Feature branch. The files in both the Trunk and Feature
> Branch have Windows-style CRLF EOL characters, however, when I merge,
> certain files appear as having conflicting EOLs. I did try the ignore
> EOL option as well as ignore all whitespace, however, still some files
> appear conflicted and the diff tool seems even more confused (the
> attached PNG is for this ignoring EOL/whitespace case, where I get this
> section of orange and question marks in the merged copy.).
>
> Any ideas on what could be going wrong here?

That's strange. Should not happen.
What version of TSVN are you using?
Does the conflict happen *after* the merge or *during* the merge?
Do you have an svn:mime-type property set on those files?
Maybe the svn:eol-style property is not set or was set after the
revision which is merged?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1104105
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].