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

RE: Re: Problem to avoid automatic merges during updates

From: Schreiner Matthias <Matthias.Schreiner_at_alcatel-lucent.de>
Date: Wed, 29 Oct 2008 08:35:15 +0100

Hi Jean-Marc, and all

I'm currently trying "svn:mime-type" set to "application/octet-stream".

I hope it helps... I need to wait until someone else is in the office to
try this ;]

Thanx a lot

Matthias

 

-----Original Message-----
From: Jean-Marc van Leerdam [mailto:j.m.van.leerdam_at_gmail.com]
Sent: 29 October 2008 08:29
To: users_at_tortoisesvn.tigris.org
Subject: Re: Problem to avoid automatic merges during updates

Hi Matthias,

On 29/10/2008, Schreiner Matthias <Matthias.Schreiner_at_alcatel-lucent.de>
wrote:
> 2) change the property of the files to an binary file (I found the
> property "executable", and tried this).

This is done by setting the SVN property svn:mime-type on the file to
something that is not automatically merged by SVN.

--
Regards,
Jean-Marc
----------------
    ___
   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-29 08:35:28 CET

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