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

Re: Merging Binary files

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-07-12 23:56:06 CEST

On Jul 12, 2007, at 05:40, claudia logan wrote:

> But is there a way to just force binary merge since I know this is
> what I want, or "turn off" the diff for them. This process should
> be completed with minimal effort and short amount of time. It
> seems is almost easier to just "copy-n-paste" from trunk to branch
> and finish sooner.

I think you're asking: is there a way to "turn off" the conflict, and
have Subversion just use the new version, overwriting the old
version, regardless of conflicts. No, there isn't. After you merge,
you will probably get a conflict. If you want to overwrite the old
version, then do that (move the new file over the original file, and
then tell Subversion the conflict is resolved). If this is too much
work, then you can write a wrapper around svn merge, which does the
merge and then does the moving and resolving. Call this wrapper
instead of calling svn merge directly.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 12 23:56:09 2007

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

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