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

Bug report - merging binary files

From: Jeff Simon <jas_at_rephunter.net>
Date: Sat, 13 Dec 2008 11:26:39 -0600

Ever since we started using TSVN in May of 2006, every single merge or
unified diff always shows all the binary files in our repo to be different
between branches, even though this is not the case.

For example, we have a small number of small gifs and other binary files in
our repo. When a merge is done, the merge reports all these files as
"updated", even though they almost never change. For example, the following
is an extract of the merge report:

Command: Merging from https://**************/stable, revision HEAD to
https://***************/current, revision HEAD into
F:\WebSites\RepHunter\dev\stable, respecting ancestry
Merging differences between repository urls:
F:\WebSites\RepHunter\dev\stable
Updated: F:\WebSites\RepHunter\dev\stable\flash\AudioPlayer.swf
Updated: F:\WebSites\RepHunter\dev\stable\images\instantssl_site_seal.gif
Updated: F:\WebSites\RepHunter\dev\stable\images\buttons\unignore-blue.gif
...

However, these files are not in fact different. When the commit is done,
they are ignored as they should be, even though they were reported as
updated.

Likewise, a unified diff shows an entry similar to the following for each
such file:

Index: images/instantssl_site_seal.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

I think this is probably due to a setting somewhere. It would be very
surprising if this were due to a bug, because of it would have been noticed
by vast numbers of users long ago.

Why do we see such a result?

Jeff Simon
RepHunter
http://www.rephunter.net

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-13 18:26:58 CET

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

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