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

Re: [TSVN] Files that should not be merged when you update

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-10-11 13:37:19 CEST

On Mon, 11 Oct 2004 11:52:02 +0200, Roland Erbs <r.erbs@niros.com> wrote:
> We have some binary files and come C-files (generated by a case tool) that
> should not be merged when you select Update... The repository version should
> overwrite the working copy.
> Is svn:mime-type property the way to handle this?

That depends: if you have local modifications, then Subversion will
_not_ replace the file but report a conflict.

> What is the "state-of-the-art" way to handle files where it does not make
> sense to merge when you update?

You can always set the svn:mime-type to application/octed-stream or
something else that doesn't start with 'text/'. Then Subversion will
handle those files as binary.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 11 14:39:41 2004

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

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