2008/12/13 Jeff Simon <jas_at_rephunter.net>:
> 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.
How were the two branches created? The question is whether subversion
knows those files are related, i.e. that they have a common ancestor.
Try using the log dialog or revision graph to see the history. If
there is no common ancestor then subversion has to report updating the
files even if it involves no change in data.
> 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
All that tells you is that you cannot diff binary files, only text files.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=983829
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-13 19:33:01 CET