Re: svn merge operation extremely slow

2011-09-30 Thread Johan Corveleyn
On Fri, Sep 30, 2011 at 3:29 PM, Kyle Leber wrote: > I've encountered what I think is a problem with subversion, but I'm not > completely sure (and according to the online instructions I should bring it > up here prior to filing a bug). Actually, the instructions on http://subversion.apache.org/i

Re: svn merge operation extremely slow

2011-10-01 Thread Johan Corveleyn
[ Please do not top-post on this list, i.e. please put your reply below or inline. More below ... ] On Sat, Oct 1, 2011 at 6:49 PM, Kyle Leber wrote: > On Fri, Sep 30, 2011 at 7:15 PM, Johan Corveleyn wrote: >> >> On Fri, Sep 30, 2011 at 3:29 PM, Kyle Leber wrote: >> > I've encountered what I t

Re: svn merge operation extremely slow

2011-10-01 Thread Daniel Shahaf
Johan Corveleyn wrote on Sat, Oct 01, 2011 at 20:47:29 +0200: > [ Please do not top-post on this list, i.e. please put your reply > below or inline. More below ... ] > > On Sat, Oct 1, 2011 at 6:49 PM, Kyle Leber wrote: > > On Fri, Sep 30, 2011 at 7:15 PM, Johan Corveleyn wrote: > >> > >> On Fri

Re: svn merge operation extremely slow

2011-10-01 Thread Kyle Leber
Thanks, Johan. I tested with 1.7rc4 and it did not make any perceptible difference. Anything else I can try? On Fri, Sep 30, 2011 at 7:15 PM, Johan Corveleyn wrote: > On Fri, Sep 30, 2011 at 3:29 PM, Kyle Leber wrote: > > I've encountered what I think is a problem with subversion, but I'm not

Re: svn merge operation extremely slow

2011-10-01 Thread Kyle Leber
What method of profiling do you recommend? I have used gprof previously (it's been awhile) but am not familiar with the subversion project source code and build setup. Is the a online guide or wiki describing the preferred setup for performing this? Kyle On Sat, Oct 1, 2011 at 3:10 PM, Daniel S

Re: svn merge operation extremely slow

2011-10-01 Thread Daniel Shahaf
gprof is what I'm familiar with (nutshell: compile with 'gcc -pg' and read gmon.out). There are no specific profiling docs for svn; if you need more specific advice please post to the dev@ list. Thanks! Kyle Leber wrote on Sat, Oct 01, 2011 at 19:33:10 -0400: > What method of profiling do you re

Re: svn merge operation extremely slow

2011-10-02 Thread Kyle Leber
I was able to capture a profile from svn (after remembering I have to link statically). I compiled with "-pg -O0" Here is the top of the file: Each sample counts as 0.01 seconds. % cumulative self self total time seconds secondscalls s/call s/call name 88.88

Re: svn merge operation extremely slow

2011-10-02 Thread David Chapman
On 10/2/2011 2:08 PM, Kyle Leber wrote: I was able to capture a profile from svn (after remembering I have to link statically). I compiled with "-pg -O0" Here is the top of the file: Each sample counts as 0.01 seconds. % cumulative self self total time seconds secon

Re: svn merge operation extremely slow

2011-10-02 Thread Daniel Shahaf
Kyle Leber wrote on Sun, Oct 02, 2011 at 17:08:16 -0400: > Is it OK to attach the full report to this user list? The resulting text > file is 1.3MB and I wasn't sure if the list would tolerate an attachment of > that size. It would be better to upload it somewhere and send a link to this list, or

Re: svn merge operation extremely slow

2011-10-02 Thread Johan Corveleyn
On Sun, Oct 2, 2011 at 11:08 PM, Kyle Leber wrote: > I was able to capture a profile from svn (after remembering I have to link > statically).  I compiled with "-pg -O0" Here is the top of the file: > > Each sample counts as 0.01 seconds. >   %   cumulative   self  self total >  ti

Re: svn merge operation extremely slow

2011-10-02 Thread Kyle Leber
Johan, I did a little more digging. There were a few different places where svn seems to get hung up so I ran the gprof report on just the first one (the merge takes hours otherwise). In this particular case, svn prints out that it is merging from a small text file while it is hanging for more t

Re: svn merge operation extremely slow

2011-10-02 Thread Daniel Shahaf
Kyle Leber wrote on Sun, Oct 02, 2011 at 20:05:19 -0400: > Johan, > > I did a little more digging. There were a few different places where svn > seems to get hung up so I ran the gprof report on just the first one (the > merge takes hours otherwise). In this particular case, svn prints out that

Re: svn merge operation extremely slow

2011-10-02 Thread Kyle Leber
Yup, trunk version has empty properties branch version has: svn:mime-type application/octet-stream On Sun, Oct 2, 2011 at 8:10 PM, Daniel Shahaf wrote: > Kyle Leber wrote on Sun, Oct 02, 2011 at 20:05:19 -0400: > > Johan, > > > > I did a little more digging. There were a few different place

Re: svn merge operation extremely slow

2011-10-03 Thread Johan Corveleyn
[ Again: please don't top-post on this list. I'm moving your reply to the bottom. More below ... ] On Mon, Oct 3, 2011 at 2:24 AM, Kyle Leber wrote: > On Sun, Oct 2, 2011 at 8:10 PM, Daniel Shahaf > wrote: >> >> Kyle Leber wrote on Sun, Oct 02, 2011 at 20:05:19 -0400: >> > Johan, >> > >> > I did

Re: svn merge operation extremely slow

2011-10-03 Thread Kyle Leber
On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn wrote: > [ Again: please don't top-post on this list. I'm moving your reply to > the bottom. More below ... ] > > On Mon, Oct 3, 2011 at 2:24 AM, Kyle Leber wrote: > > On Sun, Oct 2, 2011 at 8:10 PM, Daniel Shahaf > > wrote: > >> > >> Kyle Leber w

Re: svn merge operation extremely slow

2011-10-03 Thread Daniel Shahaf
Kyle Leber wrote on Mon, Oct 03, 2011 at 08:16:53 -0400: > On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn wrote: > > (2) If the "base" of the merge target doesn't have a mime-type, look > > if it has one on the "actual" node (the uncommitted local > > modifications). If that's binary, then we'll

Re: svn merge operation extremely slow

2011-10-03 Thread Johan Corveleyn
On Mon, Oct 3, 2011 at 2:16 PM, Kyle Leber wrote: > > > On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn wrote: >> >> [ Again: please don't top-post on this list. I'm moving your reply to >> the bottom. More below ... ] >> >> On Mon, Oct 3, 2011 at 2:24 AM, Kyle Leber wrote: >> > On Sun, Oct 2, 2

Re: svn merge operation extremely slow

2011-10-03 Thread Johan Corveleyn
On Mon, Oct 3, 2011 at 2:35 PM, Johan Corveleyn wrote: > On Mon, Oct 3, 2011 at 2:16 PM, Kyle Leber wrote: >> >> >> On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn wrote: >>> >>> [ Again: please don't top-post on this list. I'm moving your reply to >>> the bottom. More below ... ] >>> >>> On Mon

Re: svn merge operation extremely slow

2011-10-03 Thread Daniel Shahaf
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

Re: svn merge operation extremely slow

2011-10-03 Thread Stefan Sperling
On Mon, Oct 03, 2011 at 02:59:25PM +0200, Johan Corveleyn wrote: > On Mon, Oct 3, 2011 at 2:35 PM, Johan Corveleyn wrote: > > On Mon, Oct 3, 2011 at 2:16 PM, Kyle Leber wrote: > >> I set the mime-type to "application/octet-stream" in the working copy prior > >> to merge and this fixed the problem

Re: svn merge operation extremely slow

2011-10-03 Thread Johan Corveleyn
On Mon, Oct 3, 2011 at 3:02 PM, Daniel Shahaf 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 min

Re: svn merge operation extremely slow

2011-10-03 Thread Johan Corveleyn
On Mon, Oct 3, 2011 at 3:04 PM, Stefan Sperling wrote: > On Mon, Oct 03, 2011 at 02:59:25PM +0200, Johan Corveleyn wrote: >> On Mon, Oct 3, 2011 at 2:35 PM, Johan Corveleyn wrote: >> > On Mon, Oct 3, 2011 at 2:16 PM, Kyle Leber wrote: >> >> I set the mime-type to "application/octet-stream" in th

Re: svn merge operation extremely slow

2011-10-05 Thread Kyle Leber
On Mon, Oct 3, 2011 at 9:55 AM, Johan Corveleyn wrote: > On Mon, Oct 3, 2011 at 3:04 PM, Stefan Sperling wrote: > > On Mon, Oct 03, 2011 at 02:59:25PM +0200, Johan Corveleyn wrote: > >> On Mon, Oct 3, 2011 at 2:35 PM, Johan Corveleyn > wrote: > >> > On Mon, Oct 3, 2011 at 2:16 PM, Kyle Leber >