On 28.10.2011 18:21, Gleason, Todd wrote:
> 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.
That post was from a time when 1.7 was still under heavy development.
The statement was about what was planned back then. But as you now
discovered, the binary patch format never made it to the release.
It's not in the release notes either.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-31 10:21:13 CET