[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: Jeremy Bettis <jeremy_at_deadbeef.com>
Date: 2004-08-17 22:28:41 CEST

From: "Ben Collins-Sussman" <sussman@collab.net>
> On Sun, 2004-08-08 at 21:01, Tom Eastman wrote:
>
> > 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?
>
> No, Subversion will absolutely, never-ever destroy local modifications.
> As Jacob said, perhaps you need a tool like rsync.

Actually I have a similar desire, but a different application. We have a
Version.h in each project that changes automatically with each make, and
subversion always marks that file as comflicted. You could keep your rule
about not destroying local modifications, but set a flag auto-resolves the
conflict or something.

I imagine a property like svn:ignore-conflict = yes, which would do the
equilenent of:

svn update file
mv file.mine file
svn resolved file
(but perhaps without actually creating and moving the conflict files)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 22:31:17 2004

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