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

--diff3-cmd for binary files

From: <lgo_at_mobsol.be>
Date: 2005-07-11 10:39:06 CEST

Hi all,

I'm setting up a procedure where changes on a hotfix branch are merged to
a maintenance branch. But, instead of using a standard merge, we want that
all files that were changed on the hotfix branch are copied over to the
the maintenance branch, ie. a replace action.

To make this possible, I used the --diff3-cmd parameter to svn merge, and
used a standard replace script ( YOURS=$9 \n echo $YOURS \n exit 0 ).

This works pretty well for text files, but fails for binary files, putting
them in Conflict state. Which was unwanted, because in our case we definitely
know how to merge binary files. I didn't find another option to force this.

Is there a way to force this behaviour for binary files as well.

Any ideas?



This message was sent using IMP, the Internet Messaging Program.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 11 10:40:04 2005

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

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