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

Re: TSVN 1.7: Merge conflicts for binary files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 06 Aug 2011 10:13:13 +0200

On 05.08.2011 21:37, Dave Huang wrote:
> I didn't see any mention of this in the TSVN 1.7 release notes, but the
> merge conflict dialog seems to have changed. In 1.6, if there was a
> conflict, two of the choices on the "Resolve Conflict" dialog box were
> "Use local" and "Use repository". In 1.7, those two are no longer
> available, and have been replaced with "Prefer local" and "Prefer
> repository". I gather from the documentation that instead of using the

Actually, the behavior hasn't changed. We just didn't realize it before
(ok, that was my fault). The buttons (and docs) now just indicate better
what the function actually does.
SVN 1.7 has that function extended: it now allows to use only the
conflicted chunks (as before) but also the complete file.
For binary files, TSVN now uses the whole file instead of chunks, i.e.
it returns svn_wc_conflict_choose_mine_full instead of
svn_wc_conflict_choose_mine_conflict.

> entire local file or the entire repo file, discarding all of the changes
> in the file that wasn't selected, the new options only affect lines
> which have conflicts--lines with no conflicts are still merged. While I
> can see how that'd be better for text files, I don't understand what
> they do for binary files, where Subversion doesn't know how to merge
> them. I also notice that the "Edit conflict" button is available for
> conflicts on binary files, whereas it was grayed out in 1.6.x. Clicking
> on it opens TortoiseMerge, which tells me that "The file ... is not a
> valid text file!"
> If I select either "Prefer ..." option, I'm not sure what happens
> exactly, but the file is still left with a conflicted status. I think
> the 1.6 behavior was much more useful for binary files--I could either
> "Use local", "Use repository", or "Resolve later". In 1.7, it appears
> that "Prefer local" and "Prefer repository" do the same thing as
> "Resolve later" for binaries.

hmmm, there's something wrong here: Subversion doesn't recognize that
the file is binary (the is_binary bool is false!).
I'll have to investigate this...

Stefan

-- 
        ___
   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=2811387
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-06 10:13:42 CEST

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