Re: svn merge problem

[Auke Jilderda <au...@philips.com>]

Hi Ondra,

I should have posted this to the original thread so thanks for reminding me!

It turned out to be a different issue: Currently, SVN's integrated 
contextual diff engine always optimises the diff on size.  In our case, 
it took the diffing engine so much time to compute the diff of an 8 MB 
XML file that the server concluded the connection to be dead because of 
lack of activity and closed it.

As a workaround, we configured an external diff engine (the GNU diff) 
and configure it to optimize to speed.  For now, that works.  In the 
meantime, I know the SVN team is evolving their diff engine to include 
the ability to optimise on speed.

Hope this helps,


Auke

Ondra wrote:
> Hi Auke,
> I found discussion about your problems with svn merge here 
> http://www.contactor.se/~dast/svnusers/archive-2004-07/0891.shtml and
> there you wrote that you will find out if that problems are
> influenced by http-compression. Did you tried it? What are the
> results?
> I have slow connection and a big repository so I would rather not to
> switch off compression, only upgrade svn to most recent version and I
> try to ask you instead of waiting another hour for merge...
> 
> Sorry for disturbing you.
> 
> thanks
> Ondrej Preclik


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org