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

Re: Merging the unmergable

From: Matt Sickler <crazyfordynamite_at_gmail.com>
Date: 2007-09-12 00:37:52 CEST

You would need to use a wrapper for svn update that would check for a
conflict. Then do the proper scripting on that conflict.

SVN provides no hook mechanism to do this automatically.

On 9/11/07, Miller, Eric <Eric.Miller@amd.com> wrote:
> > -----Original Message-----
> > From: Matt Sickler [mailto:crazyfordynamite@gmail.com]
> > Sent: Tuesday, September 11, 2007 4:17 PM
> > On 9/11/07, Miller, Eric <Eric.Miller@amd.com> wrote:
> > > Does anyone know if there is a way to specify a merge script for
> binary
> > > files? The --diff3-cmd switch only seems to work on text files.
> > You cant merge binary files. You must pick either 1. yours, 2. the
> > one from the repo, or 3. halt, rewrite your binary, then recommit.
> You mean "can't" as in "Subversion has no way to let you" or "can't" as
> in "binary files are intrinsically unmergable"?
> Cuz I have some binary files I can, and would like to, merge.
> Ex:
> Say (for whatever reason) I must maintain binary files.
> Lets just say that some 3rd party tool reads and writes these.
> But it is possible for me to create a diff script that can uncompress,
> merge the text and then rewrite the binary.
> Heck, pretend it is just a gzip'd text file and you have a good example.
> So in the case of a gzip it would be gzip -d => diff3 => gzip. But how
> do I tell subversion to use my special diff command for these binary
> files?
> Thanks!
> Eric

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 12 00:34:35 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.