On Mon, Oct 3, 2011 at 3:02 PM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> Johan Corveleyn wrote on Mon, Oct 03, 2011 at 14:59:25 +0200:
>> It may also interest you (and other readers of this thread) that there
>> is an open enhancement request for making text-merges take the same
>> shortcut as binary-merges (if mine == merge-left then set merged :=
>> merge-right), to avoid expensive diffing [1]. But that hasn't been
>> addressed yet.
>>
>>
>> [1] http://subversion.tigris.org/issues/show_bug.cgi?id=4009 : Big
>> trivial text files merged MUCH slower than binary - pls optimize.
>>
>
> Isn't "Set the svn:mime-type property locally, and revert it before
> commit" a workaround for that?
Yes, it would seem so. Though it may not be very helpful in lots of
situations (because people only discover the problem after they
out-waited a merge of several hours). Still, it's useful information
to work around it (maybe people can detect the problem in some wrapper
scripts, ahead of merging), so maybe you should add it to the issue
tracker.
--
Johan
Received on 2011-10-03 15:50:13 CEST