Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: local policy)
Date: Mon, 3 Oct 2011 02:10:08 +0200
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Kyle Leber <kyle.leber@gmail.com>
Cc: Johan Corveleyn <jcorvel@gmail.com>, users@subversion.apache.org
Subject: Re: svn merge operation extremely slow
Message-ID: <20111003000955.GA24599@daniel3.local>
References: 
 <CAFmyxLhT4N7oSW9AFXXOXQds98N7-PLYf2G7+z7kPDLVeNHuYw@mail.gmail.com>
 <CAB84uBVhrGAXh3UzUZBgMjXkBsGd0dFxD0EoUd+6Z+ktGACshw@mail.gmail.com>
 <CAFmyxLhXxi_bWpMW5gNwCW2RQmMfBK=ffijaQjuzq9q3cfm5Mw@mail.gmail.com>
 <CAB84uBUUrWb+4Lrcyo-5LZSodCMB35ZvTP5gfD10-hXJt-SUpg@mail.gmail.com>
 <20111001191045.GA25864@daniel3.local>
 <CAFmyxLgzKgoq2UBa72iezSpoTr7RV6BfmF9bYQOdtz2ib5Ruhw@mail.gmail.com>
 <20111001235546.GA30144@daniel3.local>
 <CAFmyxLh8r6oC9_5R=VSn9NmeEOTSVshhyneCDsZpZV_Ho6URvw@mail.gmail.com>
 <CAB84uBWoG+i5keSrkhRkDDgMUEiVWHjoe5FPDTdTzF5cCcEiRQ@mail.gmail.com>
 <CAFmyxLgHZRSUhaK4PED8UV_tOENPR3vERmUrqzxrZ7DsJMpu1A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: 
 <CAFmyxLgHZRSUhaK4PED8UV_tOENPR3vERmUrqzxrZ7DsJMpu1A@mail.gmail.com>
User-Agent: Mutt/1.5.20 (2009-06-14)

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
> it is merging from a small text file while it is hanging for more than a
> minute @ 100% CPU.  When I examine "lsof", however, it see it actually has a
> different file open.  This one is a large (15 MB) "binary" file.  It turns
> out this binary file did not have a property in the trunk (which I think
> means it's treated as text, right?).  But in the branch it was marked as
> octet stream.   So perhaps svn is doing a text-based diff on this binary
> file because it used to be incorrectly marked as text?
> 

If either side is marked as binary then svn will defer to the "Use
merge-right if merge-left == base, else conflict" algorithm.

Could you share the value of 'svn proplist --verbose' on both files?

Thanks,

Daniel