[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Problem with Mixed EOL Styles

From: Peter Yamamoto <yamamotop_at_page44.com>
Date: 2006-10-27 19:19:55 CEST

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.

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).

Peter

-----Original Message-----
From: John McGowan [mailto:mcgowan@lynch2.com]
Sent: Friday, October 27, 2006 9:42 AM
To: users@tortoisesvn.tigris.org
Subject: Problem with Mixed EOL Styles

Hi,

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?

/John

-- 
John McGowan
mcgowan@lynch2.com
P 847.608.6900 x 110
F 847.608.9501
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Oct 27 19:20:06 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.