Cannot display: file marked as a binary type

I would post this to the Subversion users group, but this is partly in response to the TortoiseSVN Dev thread "Apply patch suggestions" from 4/25/2009. From http://svn.haxx.se/tsvn/archive-2009-04/0197.shtml I see Stefan Küng wrote:

> Another thing to remember: svn 1.7 will have a new patch format which
> includes binary changes and renames/moves. It will also provide a new
> API to create and apply such patch files. That means that the diff/patch
> feature of TMerge will have to be rewritten anyway, so I'm leaning
> towards waiting to implement these changes right now but wait at least
> until we switch the TSVN trunk to the svn trunk.
Using svn 1.7.1, I tried to create a patch file for a binary file change and got this:

Index: [file name]
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

As I look through the Subversion 1.7 release notes I do not see anything about handling of binary files. I also couldn't find any other mention of this feature on the web. Did Stefan's statement turn out to be incorrect, or are we missing something about creating patches for binary files? Can it be done with the Tortoise command line vs. the Subversion command line?

I then actually tried using svn diff -force. This generated a patch file. I saved a copy of the modified file, reverted the binary file, used svn patch to apply the change, and then compared the patched result with the originally modified binary.

The result at this point was a corrupted file. So it would seem that diff -force is not the answer either.

I tried using Tortoise to do this, and got the same error as above. (This occurs even if selecting the option for using the git format.) There is no "force" option that I can see in Tortoise.

Am I missing something, or is this feature not yet implemented either in svn or Tortoise? If anyone knows of any wrapper utilities of any sort that handle binaries, I would like to know that as well.

--Todd

________________________________
Please consider the environment before printing this e-mail.

The contents of this e-mail message (including any attachments) are confidential to and are intended to be conveyed for the use of the recipient to whom it is addressed only. If you receive this transmission in error, please notify the sender of this immediately and delete the message from your system. Any distribution, reproduction or use of this message by someone other than recipient is not authorized and may be unlawful.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2866192

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-28 18:19:57 CEST