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

Re: How to disable "contextual, line-based merging" ?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-08-06 15:02:52 CEST

On Aug 6, 2005, at 5:36 AM, Pekka Niiranen wrote:

> Hello there,
> I would like to force subversion to treat all files as binary so
> that it will never try to do any "contextual, line-based merging"
> during "svn update" -command. Also whenever I "svn add" any
> file to repository it is automatically "marked" as binary.
> Whenever local copy is out of date, updating should result as
> "conflict".
> Forcing "svn:mime-type" as binary for the whole repository?
> Any ideas?

Give every file the svn:mime-type property with a value of
"application/octet-stream". Then activate auto-props in your
~/.subversion/config file to automatically do the same for any files
you 'svn add' in the future.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 6 15:06:22 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.