[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: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2005-07-25 23:28:05 CEST

Thanks for following up.

I think this suggestion makes sense, and would help us out in some more
advanced use cases. With the tools we have now there's no read need to
make a difference in behaviour between text and binary anyway.

Lieven.

-----Original Message-----
From: cmpilato@localhost.localdomain [mailto:cmpilato@localhost.localdomain]
On Behalf Of C. Michael Pilato
Sent: maandag 25 juli 2005 16:08
To: dev@subversion.tigris.org
Cc: lgo@mobsol.be
Subject: Re: --diff3-cmd for binary files

Julian Foad <julianfoad@btopenworld.com> writes:

>
> 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".

Yeah, and I think this is a flaw in Subversion. I think I'd like Subversion
to expand it's "allowed to merge" check from:

  (! is_binary)

to:

  (! is_binary) || (diff3_cmd_option_is_in_use)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

--
No virus found in this incoming message.
Checked by AVG Anti-Virus.
Version: 7.0.338 / Virus Database: 267.9.4/57 - Release Date: 22/07/2005
 
-- 
No virus found in this outgoing message.
Checked by AVG Anti-Virus.
Version: 7.0.338 / Virus Database: 267.9.4/57 - Release Date: 22/07/2005
 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 25 23:33:47 2005

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