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

Re: Performance regression with reverse merge

From: Mark Phippard <markphip_at_gmail.com>
Date: Sun, 1 Mar 2009 12:52:49 -0500

So here are my timings from Linux using 1.6.0 RC2. I'll try again
with 1.5.6 in a bit. My home folder is on a NetApp, so the svn up
command is just to get a timing on walking and locking the WC.

$ time svn up -r15533 --ignore-externals TSVN
At revision 15533.

real 0m2.575s
user 0m0.052s
sys 0m0.064s
$ time svn diff -r 15456:15455
http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk > /dev/null

real 0m0.494s
user 0m0.019s
sys 0m0.011s
$ 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 1m13.431s
user 0m1.899s
sys 0m1.507s

I also tested from a Windows system running RC2. For this test, I
only checked out the "src" folder and did the merge relative to it.
Here are those timings. The Windows tests got to the merge
notifications in a similar timeframe to Linux but then had a really
long delay before finishing.

I agree this seems slower than it ought to be.

H:\>timethis "svn up --ignore-externals -r15533 TSVN_src"

TimeThis : Command Line : svn up --ignore-externals -r15533 TSVN_src
TimeThis : Start Time : Sun Mar 01 09:48:47 2009

At revision 15533.

TimeThis : Command Line : svn up --ignore-externals -r15533 TSVN_src
TimeThis : Start Time : Sun Mar 01 09:48:47 2009
TimeThis : End Time : Sun Mar 01 09:48:50 2009
TimeThis : Elapsed Time : 00:00:02.322

H:\>timethis "svn merge -r 15456:15455 http://tortoisesvn.tigris.org/svn/tortois
esvn/trunk/src TSVN_src"

TimeThis : Command Line : svn merge -r 15456:15455 http://tortoisesvn.tigris.o
rg/svn/tortoisesvn/trunk/src TSVN_src
TimeThis : Start Time : Sun Mar 01 09:49:38 2009

--- Reverse-merging r15456 into 'TSVN_src\TortoiseProc\RevisionGraph\RevisionGra
phDlg.cpp':
U TSVN_src\TortoiseProc\RevisionGraph\RevisionGraphDlg.cpp
--- Reverse-merging r15456 into 'TSVN_src\TortoiseProc\RevisionGraph\RevisionGra
phDlg.h':
U TSVN_src\TortoiseProc\RevisionGraph\RevisionGraphDlg.h

TimeThis : Command Line : svn merge -r 15456:15455 http://tortoisesvn.tigris.o
rg/svn/tortoisesvn/trunk/src TSVN_src
TimeThis : Start Time : Sun Mar 01 09:49:38 2009
TimeThis : End Time : Sun Mar 01 09:51:45 2009
TimeThis : Elapsed Time : 00:02:07.322

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1251558
Received on 2009-03-01 18:53:04 CET

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

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