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

Re: --diff3-cmd for binary files

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-07-23 12:48:35 CEST

lgo@mobsol.be wrote (on 11th July):
> 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.

I didn't see an answer to this message. I don't think there is a way to get
Subversion to merge files that it thinks are "binary", but I think there should be.

You can get Subversion to diff such files by specifying "--force", but
"--force" does not have that effect on "svn merge".

- Julian

> Any ideas?
> regards,
> Lieven.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 23 12:49:17 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.