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

RE: Bug report - merging binary files

From: Jeff Simon <jas_at_rephunter.net>
Date: Sat, 17 Jan 2009 14:44:26 -0600

Solution found based upon information provided below.

It has been over a month since the previous email on this topic. But it took
us a while to get back to it. In fact the information led to the solution.
Simon said

        If there is no common ancestor then subversion has to report
updating the files even if it involves no change in data

We concluded that the file in question were added directly into the working
copy for the branches, and not merged. Thus they had no common anscestors.

The correction was simplicity itself: simply delete the files from the local
working copy using TSVN, merge the deletions to the other branches, then add
them back to the local working copy using TSVN, and merge the additions.

Thanks!

Jeff

-----Original Message-----
From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
Sent: Saturday, December 13, 2008 12:33 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Bug report - merging binary files

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=9
83829
To unsubscribe from this discussion, e-mail:
[users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1031228
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-17 21:44:46 CET

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