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

Re: svn merge operation extremely slow

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 3 Oct 2011 15:02:27 +0200

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?

> --
> Johan
Received on 2011-10-03 15:03:12 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.