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

Re: When SVN edits a file itself (i.e. to resolve conflicts), the text is corrupted.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-18 17:32:44 CET

On Feb 18, 2005, at 10:19 AM, Jeffrey Vaughan wrote:
> The quick work around is to make sure whatever editor you use is
> saving in 8-bit ascii.

Or, set the 'svn:mime-type' property to something that isn't 'text/*'.
Then your client will treat the file as a binary blob, and not attempt
to do contextual, line-based diffing and merging.

At this time, neither GNU diff nor svn's internal diff library are able
to handle UTF16 (though, in theory, they could be taught to do so.)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 18 17:36:19 2005

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.