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

Re: Problem with diff/merge of files marked as binary

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-03-13 17:28:30 CET

On 3/9/07, mb <maximilian.bernhardt@post.rwth-aachen.de> wrote:

> I think this is a bug. I run a stock 1.4.2 Cygwin Binary as client and
> a stock HPUX 1.3.2 server.
>
> Now since setting the mime-type doesn't seem to work, is there any
> other way to exclude textfiles from merges?

There's no bug here.

The only thing 'binary' mime-type does is prevent the svn client from
doing a contextual line-based three-way merge. And a three-way merge
*only* happens if the server is sending changes to a file that you've
already modified locally... in other words, when there's potential for
a conflict.

If your local file has no changes, then 'svn up' and 'svn merge' can
absorb server changes into any file, regardless of mime-type. That's
because it's using a binary-differencing algorithm under the hood.
The line-based merging algorithm only happens for conflicts.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 13 17:28:47 2007

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