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

Re: [TSVN] Update should replace binary files. How?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-03-18 13:41:40 CET

Aniruddha Apte wrote:
> Is there a way to tell update to replace a binary file (e.g. *.lib)
> with the repository copy and not worry about conflicts? Right now,
> when I do an update, I have to rename the latest revision and then
> mark it resolved. Any way to automate this?

No. Doing that would mean that Subversion has to loose data (your local
modifications of that file). And Subversion *never* looses data, and you
can't even tell it to.

> (In my case the binary file is a library that is from an external or
> different project).
> I suppose I can solve this using vendor branches?

Not really! If you have a file versioned which get's modified
automatically by your build procedure, then you will always get
conflicts. Question is: why is this file versioned anyway?

Stefan

-- 
        ___
   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 Fri Mar 18 13:42:14 2005

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.