[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, 6 Aug 2011 10:52:33 +0200

On Sat, Aug 6, 2011 at 10:13, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> 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...

Update: fixed the problem in the svn library and proposed the fix for
backporting to the 1.7.x branch.
Should be fixed in the nightly builds soon (can't really say how long
it takes to get two more votes for the backport).

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

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