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

Re: [TSVN] How to apply a binary patch?

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-12-03 20:02:20 CET

craigb@ati-uk.com wrote:

> Well, it is possible to show differences in binary files. I know of at least
> one program (HexWorkshop) that can show side-by-side diffs of binary files.

Ok, you can show diffs as HEX - but can you tell which part you want to
use if there's a conflict? And how many people would know what to do
with a HEX diff?

>>So that's why there are no binary patchfiles at all.
> Can't subversion create patchfiles with binary data in it when you use svn
> diff? In fact, I just created a patch file using Tortoise that consisted of
> a single byte change to a binary file. It works fine.

Subversion uses binary diffs when communicating with the repository. But
that's a whole different story than using binary diffs as patchfiles.
And how could you create a patchfile with TSVN of a binary file? That
would work _only_ if you set the mimetype of that file to something text
like. And then it won't work correctly (you *will* loose your data!) if
the binary file contains a CR or an LF char - one such byte is enough
and your binary file is corrupted!

> I don't expect TortoiseMerge to have a human-readable display of the
> differences (although it could), but I would at least like to be able to
> apply a patch which contains binary data to my working copy. Surely this
> must be possible somehow?

Sure it would be possible somehow. But you have to ask on the Subversion
mailing list for that feature.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Dec 3 20:03:05 2004

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

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