RE: EOL errors when using merge

Ignoring EOL in TortoiseMerge. I hadn't thought of setting options in
the diff viewer.

I think my problem is that the revisions being searched were 0:HEAD but
the files in question were moved some time along the way, so the BASE
was empty, and therefore the THEIRS changes consisted of the entire file
(with the wrong EOL, for some reason).

When I changed the revision range to be at the time the branch was
created (which was after the refactor that moved the files around), this
diff problem went away.

Thanks,
-Paul

-----Original Message-----
From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
Sent: Wednesday, February 04, 2009 4:30 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: EOL errors when using merge

2009/2/4 Jackson, Paul A. <Paul_Jackson_at_g1.com>:
> 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?

Are you ignoring EOLs in TortoiseMerge or are you ignoring EOLs when
you do the merge? The latter may require server support, not sure.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessage
Id=1104116
To unsubscribe from this discussion, e-mail:
[users-unsubscribe_at_tortoisesvn.tigris.org]. 
 
NOTICE: This E-mail may contain confidential information. If you are not
the addressee or the intended recipient please do not read this E-mail
and please immediately delete this e-mail message and any attachments
from your workstation or network mail system. If you are the addressee
or the intended recipient and you save or print a copy of this E-mail,
please place it in an appropriate file, depending on whether
confidential information is contained in the message.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1104611
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].