John McGowan wrote:
> Peter Yamamoto wrote:
>> For diffing, you can use a diff tool that handles multiple line ending
>> styles (or allows you to customize). You might want to look at Beyond
>> Compare by Scooter software.
> Yeah, that's why I'm not as concerned with diffing as I am with merging.
> When I do an update and my local file has to be merged with the
> server, who does the actual merging. Is that a server side thing or
> is it part of the TortoiseSVN client binaries?
> Or is it something different?
I'm referring to the automatic merging that happens, not conflict
resolution that I do with the external program.
>> If the line endings are actually changing (semi arbitrarily) then
>> merging would seem nightmarish if the line endings actually affect the
>> way the server parses (but I'd find that hard to believe other than due
>> to bugs).
>> -----Original Message-----
>> From: John McGowan [mailto:firstname.lastname@example.org] Sent: Friday, October
>> 27, 2006 9:42 AM
>> To: email@example.com
>> Subject: Problem with Mixed EOL Styles
>> I just joined this list, but i've been using TortoiseSVN for a long
>> time. And Before that TortoiseCVS.
>> I'm not sure if this question is a Tortoise one, or a general SVN one...
>> If someone has some ideas though it would be great.
>> I use a development environment that stores the logic you create in a
>> proprietary XML format. When using the IDE, if you create a large text
>> block, it stores that chunk with "CR" as eol characters instead of the
>> os default, so it creates files with mixed eol chars. The app server
>> that these XML files are interpreted by works with and I think to some
>> degree expects them to be this way. Naturally for these files I needed
>> to remove the svn:eol-style property to be able to check them in.
>> Now here's my problem. When I diff, or merge these files, the
>> definition of what a "line" isn't always granular enough, so many many
>> lines of text or markup will show up as one line in the XML, so making
>> multiple changes or merging is a pain in the rear.
>> Does anybody know of a way to make diffing and merging these types of
>> mixed files easier to work with?
P 847.608.6900 x 110
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Fri Oct 27 20:07:25 2006