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

Re: Ignore conflicts

From: <kfogel_at_collab.net>
Date: 2004-08-09 15:30:41 CEST

Tom Eastman <tom@cs.otago.ac.nz> writes:
> I have a repository running with many binary files. I'm using it merely as
> a convenient synchronisation mechanism for many different computers.
>
> I don't care about conflicts. I'd like 'svn update' to always clobber any
> locally modified files if there is a newer version on the server.
>
> Is there any way to prevent 'svn' from generating the 'file.r??' stuff when
> there's a conflict and just always overwrite the original file?

Why don't you just run 'svn st -u' in the working copy first, parse
the output, and remove any locally modified files that are about to
receive an update anyway?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 9 17:05:38 2004

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