Re: Performance regression with reverse merge

Here is the 1.5.6 merge timing:

$ time svn merge -r 15456:15455
http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk ~/TSVN
--- Reverse-merging r15456 into
'/home/mphippard/TSVN/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp':
U /home/mphippard/TSVN/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp
--- Reverse-merging r15456 into
'/home/mphippard/TSVN/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.h':
U /home/mphippard/TSVN/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.h

real 0m40.362s
user 0m1.289s
sys 0m0.946s

As a reminder, this is what it was for 1.6 RC2:

 real 1m13.431s
 user 0m1.899s
 sys 0m1.507s

So it is slower for sure. I'd guess the difference is even worse when
the network is slower.

Does the tree conflicts work possibly introduce some new checking and
network turnarounds?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1251622