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

RE: RE: Odd Conflicts (EOL issues) in repo converted from VSS

From: Damian Sinclair <Damian.Sinclair_at_homechoice.net>
Date: 2007-01-30 16:35:32 CET

> Alternatively, does anyone know of an external diff/merge
> tool that can ignore eol changes and can be used as an
> external tool via the diff-cmd and diff3-cmd configuration
> options? I've tried using kdiff3 in this way and it doesn't
> seem to play nicely with svn's expectation of return values
> for conflicts.

 I have a partial solution in place, which is to use the gnu diff utils
(via cygwin on Windows) with the --strip-trailing-cr option. This
performs diffs and merges correctly (for the test cases I've tried so
far) but is a very clunky workaround as it forces everyone to install
cygwin and also means that a DOS command window pops up for every diff
and merge operation. We're also left with the unpalatable prospect of
having to do some sort of mass modify of files to get the EOLs in line.

 I'll stop hassling the list about this now but if anyone has any other
options to offer I would be very happy to hear about them.

Damian Sinclair

Homechoice is a trading name of Video Networks Limited of 205 Holland Park Avenue, London W11 4XB and registered in England and Wales (No. 2740910).
This email may contain confidential and privileged information and is intended for the named or authorised recipients only. If you are not the named or authorised recipient of this email, please note that any copying, distribution, disclosure or use of its contents is strictly prohibited. If you have received this email in error please notify the sender immediately and then destroy it. The views expressed in this email are not necessarily those held by Video Networks Limited and we do not accept any liability for any action taken in reliance on the contents of this message. We do not guarantee that the integrity of this email has been maintained, nor that it is free of viruses, interceptions or interference.

This email has been scanned for all known viruses by the MessageLabs Email Security System.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 30 16:36:55 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.