TSVN 1.7: Merge conflicts for binary files

[Dave Huang]

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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2809781

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Stefan Küng]

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

[Stefan Küng]

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

[Dave Huang]

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! :)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2813305