[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: claudia logan <cvlogan1_at_yahoo.com>
Date: 2007-07-13 13:43:40 CEST

Yes, you are correct. If there are 15+ binary files (and associated source code) and I need to update my branch with approved new files, this task becomes...well annoying ( I cant thing of a better word). On the other hand, I do understand the need to ensure the proper changes take place when merging. The wrapper you mentioned, is there such a script written already? I am not much a coder....
  Also, is there a better tool to control documents? Though the idea of managing two CM systems is not very appealing...
  Thanks for all your inputs.

Ryan Schmidt <subversion-2007b@ryandesign.com> wrote:
  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

Looking for a deal? Find great prices on flights and hotels with Yahoo! FareChase.
Received on Fri Jul 13 13:43: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.