[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: Dave Huang <khym_at_azeotrope.org>
Date: Tue, 09 Aug 2011 19:22:36 -0500

On 8/6/2011 3:13 AM, Stefan Küng wrote:
> 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.

Ah, interesting... that probably explains why "Use local" in 1.6.x
didn't always do what I expected.

> 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).

I tested the TortoiseSVN 1.6.99, Build 21789 - 64 Bit -dev, 2011/08/06
09:54:27 nightly, which I'm guessing has the fix. In any case, it works
as I expect now... thanks! :)


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-10 02:22:47 CEST

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.